projects
/
tatoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
126758c
)
Merge branch 'master' of ssh://git.nguyen.vg/tatoo into lucca-master
author
Lucca Hirschi
<lucca.hirschi@gmail.com>
Thu, 28 Jun 2012 15:31:29 +0000
(17:31 +0200)
committer
Lucca Hirschi
<lucca.hirschi@gmail.com>
Thu, 28 Jun 2012 15:31:29 +0000
(17:31 +0200)
Conflicts:
.gitignore
.gitignore
patch
|
blob
|
history
diff --git
a/.gitignore
b/.gitignore
index
4ea4ac0
..
60db691
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,2
+1,3
@@
-_build
/*
-
test
.native
\
No newline at end of fil
e
+_build
+
*
.native
+
*.byt
e