Mercurial > pidgin
diff PLUGIN_HOWTO @ 26161:90ffe6f71fa9
clearing conflicts while merging from im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
| author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
|---|---|
| date | Tue, 20 Jan 2009 17:11:35 +0000 |
| parents | 83ec0b408926 |
| children | db5a58aabe38 |
