diff pidgin/gtkdocklet-x11.c @ 16323:cf62255b0a74

merge of 'b2ed97746412540812181f94bcb3e2f077321052' and 'e3a16be06e623901a0b1943a8dd9fa206d02874f'
author Mark Doliner <mark@kingant.net>
date Mon, 23 Apr 2007 07:44:12 +0000
parents 32c366eeeb99
children ca75eccdca3d
line wrap: on
line diff