Mercurial > pidgin.yaz
comparison libpurple/conversation.h @ 15839:90188f78beeb
merge of '86166d6c6bbbb2db3ad947a061bfb6f4f13d9d1c'
and '9d39bda320a4f35bdab8e3a3ec39c79d34ddedc8'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 19 Mar 2007 17:37:34 +0000 |
parents | 32c366eeeb99 |
children | e058328dc954 |
comparison
equal
deleted
inserted
replaced
15838:e622745f6f42 | 15839:90188f78beeb |
---|