comparison pidgin/gtkimhtmltoolbar.h @ 22987:5cbd119b26af

merge of '1e83e527c083d0177b89f95d8ac465b393e4991d' and '3ad9ca55d458cd83d7e8caa6bd25a68d3f253c2b'
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 16 May 2008 21:04:11 +0000
parents 44b4e8bd759b
children 92e71f6e10d4 26f55eb6ab59 22b8a92fb5ee
comparison
equal deleted inserted replaced
22984:6a5b746ddfea 22987:5cbd119b26af