comparison pidgin/gtkconv.c @ 25161:bed45a00acbc

merge of '834ff898e490cfa48f763bee4c57477814139384' and 'e972343aef69e69c61292cc8d4b4a7919f23e760'
author Paul Aurich <paul@darkrain42.org>
date Wed, 25 Feb 2009 20:36:53 +0000
parents 33ceb2b708cf
children 4b8c4870b13a 2a34a3f5da2e 9fcff08ce726 25319f536d93 e0e0cecdcd16
comparison
equal deleted inserted replaced
25160:46c0ca2b7b3b 25161:bed45a00acbc