Mercurial > pidgin
comparison libpurple/conversation.h @ 32251:c774000690b4
merge of '71541bfa4634807a1cfe0f67a9d648e640d4e293'
and '7ed9ffe3e2f743a826c72d79aba093572e6c3ad4'
author | Kevin Stange <kevin@simguy.net> |
---|---|
date | Sat, 01 Oct 2011 23:24:50 +0000 |
parents | 588f9b808a31 |
children | 9173ec5a45cf |
comparison
equal
deleted
inserted
replaced
32250:0a2cb0061be1 | 32251:c774000690b4 |
---|