Mercurial > pidgin.yaz
diff pidgin/gtkdocklet.h @ 25736:9ff63ec7d869
merge of '3fd2b0bf399bc4820c027060ec6c82ed1ca6ca45'
and 'afa3dc92175256438bf5eb8acb7876eddc64ba01'
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Wed, 27 Aug 2008 00:12:57 +0000 |
parents | d3e0eb05ac94 |
children | 584063555949 |