comparison pidgin/gtkstatusbox.c @ 31336:e9e41a04513d

merge of '5e579d58062410991f6268b66906fb7434730423' and '7eb555d9d20df94a7bef577253c8effb724ab484'
author ivan.komarov@soc.pidgin.im
date Tue, 02 Nov 2010 20:51:44 +0000
parents c9a57878ed17
children 5841cbbebc53 917c597beb97
comparison
equal deleted inserted replaced
31332:a2e2d351f6fb 31336:e9e41a04513d