comparison libpurple/conversation.c @ 26398:04a9e8435bfb

merge of '21bd048f68510f25c5c854a1c7e395e88f530503' and '22ecf5b2d3d8874d498194695cb625a789c0754a'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 01 Apr 2009 05:24:19 +0000
parents a6e3cb32cdd2
children b87843de7c6a b98519a42e53
comparison
equal deleted inserted replaced
26396:43dcfcdd6a73 26398:04a9e8435bfb