comparison pidgin/gtkimhtmltoolbar.c @ 28299:e5349d2cc7e5

merge of '249bb0ae011a3aacadd09bca9106b7ba41bf6b75' and 'dbc7434de32f5fbc5c23e94da10bed56418bfeab'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Tue, 18 Aug 2009 14:59:24 +0000
parents 38a5df43d525
children f3ccb5a36fd6 401012968fea 48ea900ee72a ce876e58cf6a
comparison
equal deleted inserted replaced
28298:ba57b7deb58a 28299:e5349d2cc7e5