comparison pidgin/gtkconv.c @ 30295:77aba27f64da

merged from im.pidgin.pidgin. removed our modification to jabber file transfer for now.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 05 May 2010 15:42:34 +0900
parents bd0ce3844104
children 89de882d25b1
comparison
equal deleted inserted replaced
30196:28dd2b7331fd 30295:77aba27f64da