comparison pidgin/gtkimhtmltoolbar.h @ 17679:1a98c57c9746

merge of '4ced433906d17bb2758a2b010ce264314d17fe04' and 'f68df768bdbeff1e201a86b96d37533c4b86f5a0'
author Mark Doliner <mark@kingant.net>
date Sun, 03 Jun 2007 21:43:49 +0000
parents 760ef6d78d2d
children 42ee8f13c917 be098f796b32
comparison
equal deleted inserted replaced
17678:2e1131c31941 17679:1a98c57c9746