comparison pidgin/gtkimhtmltoolbar.c @ 22937:4798de46bf4a

merge of '994f8bdccfcf73a73924e593d2c398c8d416e5e9' and 'e1c49c9ec5c6869ed9813feccd8ee41d2ca40f35'
author Ka-Hing Cheung <khc@hxbc.us>
date Wed, 14 May 2008 04:58:36 +0000
parents 36c3f901480d
children ed346fedec30 dea8b856466e 2c6fb4d5cea2
comparison
equal deleted inserted replaced
22936:5a359f6666c2 22937:4798de46bf4a