Mercurial > pidgin
comparison ChangeLog @ 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 | 878ad37e5a18 |
| children | 9e0458c98b4c |
comparison
equal
deleted
inserted
replaced
| 26160:97c420d62381 | 26161:90ffe6f71fa9 |
|---|
