comparison pidgin/gtkimhtmltoolbar.h @ 30759:94f8a42e529b

merge of '9655e74ffa6d13bf9ad73bdbd432f003c33cae79' and 'e44423f9da531d77c6bc71cbb54f5a9ffc2e1a18'
author Paul Aurich <paul@darkrain42.org>
date Sun, 01 Aug 2010 20:22:57 +0000
parents 47b3a53ce497
children f44718de8b06 02a2e8183b1d
comparison
equal deleted inserted replaced
30758:06d8de5dd53c 30759:94f8a42e529b