Mercurial > pidgin
comparison libpurple/conversation.h @ 26198:e1b91b7b5f69
merge of '7829ec76bdb008583f8da54e238c2265a1140db2'
and 'e10c42213b8452c2fd4906e4ca501ef3eb83bd69'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 20 Mar 2009 05:46:04 +0000 |
parents | 584063555949 |
children | 15ae2dea92b3 b98519a42e53 |
comparison
equal
deleted
inserted
replaced
26195:bcbc5994d21c | 26198:e1b91b7b5f69 |
---|