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