[bknr-cvs] r2476 - branches/trunk-reorg/thirdparty/cl-gd-0.5.6

[hhubner at common-lisp.net]

Author: hhubner
Date: Mon Feb 11 09:27:45 2008
New Revision: 2476

Modified:
   branches/trunk-reorg/thirdparty/cl-gd-0.5.6/   (props changed)
   branches/trunk-reorg/thirdparty/cl-gd-0.5.6/cl-gd.asd
Log:
ignore .so file, fix conflict

Modified: branches/trunk-reorg/thirdparty/cl-gd-0.5.6/cl-gd.asd
==============================================================================
--- branches/trunk-reorg/thirdparty/cl-gd-0.5.6/cl-gd.asd	(original)
+++ branches/trunk-reorg/thirdparty/cl-gd-0.5.6/cl-gd.asd	Mon Feb 11 09:27:45 2008
@@ -54,9 +54,5 @@
                (:file "drawing")
                (:file "strings")
                (:file "misc"))
-<<<<<<< .mine
   :depends-on (#-clisp :uffi
                #+clisp :cffi-uffi-compat))
-=======
-  :depends-on (:uffi))
->>>>>>> .r2473