Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 23199:c4b476c55b49
merge of '105b7094f7adbdda665762aa99781df1fad9d86c'
and '7347c33cabd303ddbcb162b7ad7899f3dac480ba'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Mon, 26 May 2008 06:47:32 +0000 |
parents | 3d7e9eff04d0 |
children | 0efa36fe7d7c |