Mercurial > pidgin
comparison Makefile.am @ 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 | 0085d8b80bc4 |
children | 111b464f6845 |
comparison
equal
deleted
inserted
replaced
26153:1317a9ae66e8 | 26154:618d122af044 |
---|