comparison pidgin/gtkdocklet-x11.c @ 19632:96d8119d3fcc

merge of 'e9d960379b02a0d960ef604990fee9f4439995d0' and 'fd1fb64c32414d4cc4fda6c200f15db96f436316'
author William Ehlhardt <williamehlhardt@gmail.com>
date Tue, 04 Sep 2007 05:30:44 +0000
parents 474283509a2a
children 44b4e8bd759b
comparison
equal deleted inserted replaced
19631:61473f8a5e2b 19632:96d8119d3fcc