comparison pidgin/gtkstatusbox.c @ 20473:49baf4a0ae39

explicit merge of '9a7160daa1babd3ca644d25e4314310e3f24077e' and '691c4b8c8733c44a3a80e96a60b2f6963abf3fa7'
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 21 Jul 2007 23:56:16 +0000
parents dfe4d0a0a00e
children c77cf4e8eb65
comparison
equal deleted inserted replaced
20462:3537f82db107 20473:49baf4a0ae39