Mercurial > pidgin
diff pidgin.desktop.in @ 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 | ed4ea63c0b45 |
children | 394a6c9b592c 1694eb347a78 |