Mercurial > pidgin.yaz
diff pidgin/gtkdocklet-x11.c @ 21915:b3240d483fd9
merge of '1f8afab1886606b0936e80a00245ff532d77086f'
and '846b73cefc86ff41042181a41f8ceaae6699c1f6'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Fri, 21 Dec 2007 18:58:59 +0000 |
parents | d3e0eb05ac94 |
children | f16534ec2897 2a591a5b3322 |