comparison pidgin/gtkdocklet-x11.c @ 26913:7ff22eb86083

merge of '48b95d7d853b96052d4478dd475e60a97e7bda8b' and 'd25c9ed783b024f75fac25f2320ddf5df6907c36'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 06 May 2009 19:03:22 +0000
parents 584063555949
children 211b59ac6345
comparison
equal deleted inserted replaced
26912:6028712210ca 26913:7ff22eb86083