Mercurial > pidgin.yaz
diff pidgin/gtkdocklet-gtk.c @ 31628:6448e3f3ddd4
merge of '8f2d6c5138602b96aef4fbfbc5b47c202951201b'
and 'e8c1e8a79ad64bd73663a15cc0e802b06a8bc733'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Wed, 02 Feb 2011 06:26:19 +0000 |
parents | b2bb0d04d659 |
children | fa88dc1dcabb cdbca568eaf3 |