comparison pidgin/gtkimhtmltoolbar.h @ 16867:28251f5bcd6a

merge of '069be2b4bd499fec1fb9220c617ecdd271e0fd16' and '8361a2a0d7435da94b196f8c77abe3b37d04d1e7'
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 04 May 2007 03:52:10 +0000
parents 760ef6d78d2d
children 42ee8f13c917 be098f796b32
comparison
equal deleted inserted replaced
16866:f5d699d95744 16867:28251f5bcd6a