Mercurial > pidgin
diff ChangeLog.win32 @ 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 | ded0a9cf1785 |
children | aaaff38e144f 1452c89e7f05 |