comparison pidgin/gtkimhtmltoolbar.c @ 32176:f2a3c59fc4a6

Fix up merge
author Paul Aurich <paul@darkrain42.org>
date Sat, 25 Jun 2011 19:56:59 +0000
parents 917c597beb97
children 7281d151e492 3e7a7e14af62
comparison
equal deleted inserted replaced
32175:910e966d18b3 32176:f2a3c59fc4a6