Merge branch 'master' of ssh://git.nguyen.vg/tatoo
authorKim Nguyễn <kn@lri.fr>
Thu, 28 Jun 2012 15:29:27 +0000 (17:29 +0200)
committerKim Nguyễn <kn@lri.fr>
Thu, 28 Jun 2012 15:29:27 +0000 (17:29 +0200)
Conflicts:
.gitignore

.gitignore

index 4ea4ac0..60db691 100644 (file)
@@ -1,2 +1,3 @@
-_build/*
-test.native
\ No newline at end of file
+_build
+*.native
+*.byte