[Pcsclite-cvs-commit] r2868 - /trunk/PCSC/c.sh

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Apr  7 16:22:53 2008
New Revision: 2868

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2868
Log:
revert previous patch

Modified:
    trunk/PCSC/c.sh

Modified: trunk/PCSC/c.sh
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/c.sh?rev=2868&op=diff
==============================================================================
--- trunk/PCSC/c.sh (original)
+++ trunk/PCSC/c.sh Mon Apr  7 16:22:53 2008
@@ -13,11 +13,6 @@
         --enable-usbdropdir=/usr/lib/pcsc/drivers \
         --enable-muscledropdir=/usr/lib/pcsc/services \
         --enable-maintainer-mode \
-<<<<<<< .mine
-		--disable-libhal \
 		--enable-twinserial \
-=======
-        --enable-twinserial \
->>>>>>> .r2866
         CFLAGS="$CFLAGS" \
         "$@"