git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
97d09a3
84d7c64
)
Merge branch 'master' into senslab2
author
Sandrine Avakian
<sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 10:25:55 +0000
(12:25 +0200)
committer
Sandrine Avakian
<sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 10:25:55 +0000
(12:25 +0200)
Conflicts:
sfa/util/xrn.py
Trivial merge