comparison pidgin/gtkconv.c @ 28152:fcf2d3b9f281

merge of '4b4bc04579a86d9b73a47d39654a65c1b15e1136' and '9c744758af256d9c652882ac815d5b81c710f701'
author Paul Aurich <paul@darkrain42.org>
date Tue, 04 Aug 2009 04:03:41 +0000
parents a12574d982a1
children e1cd44c7c7af 429fce11f244 f660386afa66 38f09799476a 338d6a211055 fe75cd926073
comparison
equal deleted inserted replaced
28151:4a80e0f7f185 28152:fcf2d3b9f281