diff configure.ac @ 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 62e2869e8e3d
children 6083c36f68d6 e23b447aa5ca
line wrap: on
line diff