projects
/
tatoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
126758c
b2cdc4a
)
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
Trivial merge