comparison pidgin/gtkimhtmltoolbar.c @ 28098:0e49276d9ba1

merge of '69e3f1859964483e117264088d4b6fc214709f6a' and 'b66da85de52dbcd99da3c6571add291b12b427ea'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 31 Jul 2009 04:21:30 +0000
parents 38a5df43d525
children f3ccb5a36fd6 401012968fea 48ea900ee72a ce876e58cf6a
comparison
equal deleted inserted replaced
28097:ae86b03162aa 28098:0e49276d9ba1