Mercurial > pidgin.yaz
comparison libpurple/conversation.c @ 24276:06a4e268b9f5
merge of '843d513c3da12026fc35af070a23a3d11844824c'
and 'b630f3305c53ab0eb32b948911940959cc873699'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Thu, 30 Oct 2008 03:58:19 +0000 |
parents | abf8ebd4c9e1 |
children | 5ebfa814b9e8 7f552614ec8a e4fa83bb82e0 22b8a92fb5ee |
comparison
equal
deleted
inserted
replaced
24273:6f7b24a2b746 | 24276:06a4e268b9f5 |
---|