From: Kim Nguyễn <kn@lri.fr>
Date: Thu, 28 Jun 2012 15:29:27 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.nguyen.vg/tatoo
X-Git-Tag: Core~32
X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=commitdiff_plain;h=b2cdc4af2c951630ded421041378bea7bc0f6b10;hp=7abccd2e949e2c807eab43c5f0e9b8cc80888484

Merge branch 'master' of ssh://git.nguyen.vg/tatoo

Conflicts:
	.gitignore
---

diff --git a/.gitignore b/.gitignore
index 4ea4ac0..60db691 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-_build/*
-test.native
\ No newline at end of file
+_build
+*.native
+*.byte