comparison pidgin/gtkimhtmltoolbar.c @ 23726:76d03e424f82

merge of '0fa0d7921af1ea7cb2ce3b4f768354b762110259' and 'a84d29741cb499f1788f9cf39cd33c14b3d440f2'
author Ka-Hing Cheung <khc@hxbc.us>
date Thu, 07 Aug 2008 19:36:12 +0000
parents 5c70d953a497
children 8777560c1d9f 3da0957e7821 28a7992d37b2
comparison
equal deleted inserted replaced
23724:21e40ad45822 23726:76d03e424f82