comparison pidgin/gtkdocklet.h @ 30752:00851eae12c7

merge of 'a7d49884941697519567616ac54f4c2884df05e2' and 'e15c002b6cf19a3cf1843b35457ff8b1efa78a5a'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 31 Jul 2010 23:43:39 +0000
parents 1446436616d4
children 7b794ddea945
comparison
equal deleted inserted replaced
30747:66c175a474a6 30752:00851eae12c7