Mercurial > pidgin
comparison libpurple/conversation.h @ 24263:577f9df685c2
merge of '4f7bf56fa49ba320a72f34b0df3e12c95b6bd84d'
and '5b118704741ad92794d9a27021f3862681c7b048'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Sun, 19 Oct 2008 02:33:10 +0000 |
parents | c87f7c6ab57c |
children | d8452c0bec7b 22b8a92fb5ee |
comparison
equal
deleted
inserted
replaced
24261:169c7abf41b5 | 24263:577f9df685c2 |
---|