comparison pidgin/gtkdocklet-x11.c @ 21597:14afe5a92fc2

merge of '374a8877bfa4fa06b384482815befe37f2c72b9b' and 'a8b9524fdf33c54963051d0ffbd18d9f0facf122'
author Etan Reisner <pidgin@unreliablesource.net>
date Mon, 19 Nov 2007 23:06:16 +0000
parents d3e0eb05ac94
children f16534ec2897 2a591a5b3322
comparison
equal deleted inserted replaced
21596:637037d3748c 21597:14afe5a92fc2