Mercurial > pidgin
comparison libpurple/conversation.c @ 23740:a6001ea0acbc
merge of '27269c5b28fd1f58228c46b310d26a5d208dac77'
and '8bae3778af422c41094db4e639f2cf45e6ee6259'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Fri, 15 Aug 2008 02:44:36 +0000 |
parents | abf8ebd4c9e1 |
children | 7f552614ec8a 5ebfa814b9e8 22b8a92fb5ee |
comparison
equal
deleted
inserted
replaced
23739:28ba6f2bbf23 | 23740:a6001ea0acbc |
---|