Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 20280:f00ab6c3d6d6
merge of 'd80b73af2a76c9ef004532af875209973de125b5'
and 'dae4542eb3eed2f6c9e8910ad38ae01f92631192'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Sat, 29 Sep 2007 13:32:05 +0000 |
parents | 6b8bc3309ab7 |
children | bd7244f3d491 f296be2a1039 |