Mercurial > pidgin
comparison libpurple/conversation.c @ 24099:d31ceef11df1
merge of 'aaddbdd76370264a6f95b6d787b565061e3b40d6'
and 'ab9a8e940ca290009deae6e3044bc352a0cd9223'
author | Kevin Stange <kevin@simguy.net> |
---|---|
date | Thu, 11 Sep 2008 20:58:15 +0000 |
parents | abf8ebd4c9e1 |
children | 7f552614ec8a 5ebfa814b9e8 22b8a92fb5ee |
comparison
equal
deleted
inserted
replaced
24098:dc25ef2669f6 | 24099:d31ceef11df1 |
---|