comparison pidgin/gtkdocklet-gtk.c @ 32408:16b33ffd75f8

merge of '1ca17dd26ee879f7580c72b03d018e444e0a5144' and '9000557e8a6b7649547a10cfc0fe85dbb8ce661d'
author masca@cpw.pidgin.im
date Thu, 25 Aug 2011 04:40:34 +0000
parents cdbca568eaf3
children 7281d151e492
comparison
equal deleted inserted replaced
32405:d3d41ba0c3b8 32408:16b33ffd75f8