comparison pidgin/gtkdocklet.c @ 20723:9f2bc4396160

merge of '15fd625e20fae56881c7c728a6533fd1699c351c' and '3829f989342d787500e9abe363c89909db102f4b'
author Mark Doliner <mark@kingant.net>
date Sun, 30 Sep 2007 00:37:03 +0000
parents 3b5d20590146
children c7b20abc3885 39a793dcb9df
comparison
equal deleted inserted replaced
20722:fb74c6f7eb6b 20723:9f2bc4396160