comparison pidgin/gtkstatusbox.c @ 20725:2e5ee1bf5300

merge of 'c966d1b59a11c860df756f5def6e3486d94f24e3' and 'e601ebdd94cff16d6ca584394217a48567b213d8'
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 30 Sep 2007 16:55:15 +0000
parents 6bf32c9e15a7
children aad0f10eb4dc 591267f6f1d5
comparison
equal deleted inserted replaced
20724:e73e0060a4dd 20725:2e5ee1bf5300