comparison pidgin/gtkdocklet.c @ 22320:d4998f31bc1a

merge of '4bc84ea5ca10129cd5e46b2f0f8f8e6b6a9146b3' and 'c1feccb59fff57f000efd2b3f63ad2b5029bfc97'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 24 Feb 2008 18:21:02 +0000
parents 76e0463db3aa
children 3353ac89ccb1
comparison
equal deleted inserted replaced
22318:10f9cc2808ec 22320:d4998f31bc1a