Mercurial > pidgin
comparison libpurple/conversation.c @ 30264:28d5f60910c9
merge of '6eb94bb98b242b76b07fe78fe89d136b9201d6f1'
and 'a61565c363dde22672cf7caafa30d1279ec84f33'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Mon, 12 Jul 2010 15:15:18 +0000 |
parents | 163f6c3cbdd9 |
children | 351d07aefb09 |
comparison
equal
deleted
inserted
replaced
30263:1f44f0144ff8 | 30264:28d5f60910c9 |
---|