projects
/
Faustine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9127d89
13f27ae
)
Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
author
Karim Barkati
<karimbarkati@gmail.com>
Tue, 17 Sep 2013 14:40:41 +0000
(16:40 +0200)
committer
Karim Barkati
<karimbarkati@gmail.com>
Tue, 17 Sep 2013 14:40:41 +0000
(16:40 +0200)
Conflicts:
INSTALL.txt
Trivial merge