comparison pidgin/gtkimhtml.c @ 22118:8243222c8c1b

merge of '59861e303c2e7d7bfe9c10a06497b1aaa47d6588' and '74122e66cd2ced071a030e5c2b33b64622b2fead'
author Mark Doliner <mark@kingant.net>
date Tue, 15 Jan 2008 17:56:16 +0000
parents b1a5385de557
children 2fb026d3f42b
comparison
equal deleted inserted replaced
22116:bdfe6c71c153 22118:8243222c8c1b