Mercurial > pidgin.yaz
comparison pidgin/plugins/pidgininc.c @ 26236: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 | 3cc856ca2338 |
| children | a439f24713c8 eebd46227f50 |
comparison
equal
deleted
inserted
replaced
| 26235:1317a9ae66e8 | 26236:618d122af044 |
|---|