Mercurial > pidgin
comparison libpurple/conversation.h @ 26154:618d122af044
resolving conflict - merging im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
---|---|
date | Wed, 12 Nov 2008 10:17:38 +0000 |
parents | d73ad65a7d5d |
children | c87f7c6ab57c |
comparison
equal
deleted
inserted
replaced
26153:1317a9ae66e8 | 26154:618d122af044 |
---|