Changeset 2476

Timestamp:

02/11/08 15:27:45 (1 year ago)

Author:

hhubner

Message:

ignore .so file, fix conflict

Files:

• branches/trunk-reorg/thirdparty/cl-gd-0.5.6 (modified) (1 prop)
• branches/trunk-reorg/thirdparty/cl-gd-0.5.6/cl-gd.asd (modified) (1 diff)

branches/trunk-reorg/thirdparty/cl-gd-0.5.6/cl-gd.asd

@@ -55 +55 @@
-               (:file "strings")
-               (:file "misc"))
-<<<<<<< .mine
-  :depends-on (#-clisp :uffi
-               #+clisp :cffi-uffi-compat))
-=======
-  :depends-on (:uffi))
->>>>>>> .r2473