Mercurial > pidgin
diff libpurple/conversation.h @ 26280:02861ee5b29b
merge of 'a2ba1fead74d00991a9b2fe1290f7716b1d9d5cf'
and 'b434abf35e2efd2a1c2821cbaf1ff557219ba4ad'
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Mon, 16 Mar 2009 02:59:37 +0000 |
parents | 584063555949 |
children | 15ae2dea92b3 b98519a42e53 |