Mercurial > pidgin
comparison gaim.pc.in @ 26156:3e788c0db3a6
resolved conflict -- merged im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
| author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
|---|---|
| date | Wed, 12 Nov 2008 10:23:13 +0000 |
| parents | dde5bebd5fb4 |
| children |
comparison
equal
deleted
inserted
replaced
| 26155:eb21f65728c0 | 26156:3e788c0db3a6 |
|---|