Mercurial > pidgin.yaz
comparison libpurple/conversation.c @ 27009:ef132bfb0793
merge of '4ba10f028ed5e73f7fe9f00b3131844819ed85a6'
and '70479082260072a56b0aea40ccca311822c17155'
author | Etan Reisner <pidgin@unreliablesource.net> |
---|---|
date | Fri, 22 May 2009 00:38:45 +0000 |
parents | 1ba4bbd3b0cd |
children | 2ab648c328cc 684690dbda4a b2b1fa27047a |
comparison
equal
deleted
inserted
replaced
27003:3e83f63b16b4 | 27009:ef132bfb0793 |
---|