comparison pidgin/gtkimhtml.c @ 26001:9115f71ad73a

Fixing busted merge
author Paul Aurich <paul@darkrain42.org>
date Sat, 07 Mar 2009 22:40:30 +0000
parents fabd8eda763d
children 8e594c4cdae4 d8e6a2d592a4
comparison
equal deleted inserted replaced
25465:9ea3474065dc 26001:9115f71ad73a