comparison pidgin/gtkimhtmltoolbar.c @ 30632:545ce15b619f

merge of '18ddd668ba1cc77ed0a0595a053f8a2879dddfd0' and '63b644ac7791059c9fad6128d17bccebca8ad71a'
author Paul Aurich <paul@darkrain42.org>
date Thu, 17 Jun 2010 21:23:01 +0000
parents 96d3f44d006d
children 81ffeb069847 2ab000954aff
comparison
equal deleted inserted replaced
30630:33989e3a449b 30632:545ce15b619f