comparison libpurple/protocols/qq/char_conv.c @ 28214:9ab9e5f1eec2

merge of '65195a427a4340ca3f017d8d052c0b85c1f482f2' and 'd8d0c78fad568b2380be8a8c68c1474ff3ad4ea5'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 04 Sep 2009 23:08:30 +0000
parents e87465dfcaf0
children 7f903e67a995 f1437342cc0e
comparison
equal deleted inserted replaced
28213:33921125348d 28214:9ab9e5f1eec2