Permalink
Browse files

I need to understand git....

Merge branch 'master' of https://github.com/paines/cl-puyopuyo

Conflicts:
	cl-puyopuyo.lisp
  • Loading branch information...
Anes Lihovac
Anes Lihovac committed Feb 23, 2013
2 parents f144947 + 88438b3 commit 8a7786d38be041027669658e6be46366d45eece2
Showing with 2 additions and 5 deletions.
  1. +2 −5 README.md
  2. BIN paused.png
View
@@ -1,6 +1,3 @@
-To start via slime:
-
-(load "package.lisp")
-
-(asdf:load-system "cl-puyopuyo")
+This is a Puyopuyo clone, a Tetris variant, written in Common Lisp, with SDL for graphics.
+This is my first ever Lisp project.
View
Binary file not shown.

0 comments on commit 8a7786d

Please sign in to comment.