comparison pidgin/gtkimhtmltoolbar.c @ 19282:fcc5d2de3b74

merge of '197e1b0c22949c758e407b2720f5e051f5cb4adf' and '71fc765ce0faa44411e9b8f51d5edcf908b4a1a6'
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 15 Aug 2007 03:40:42 +0000
parents 9998470a01de
children 42ee8f13c917 c7d4470de3d2
comparison
equal deleted inserted replaced
19281:2b1172af2f8b 19282:fcc5d2de3b74