git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dec60ec 6717f88)
Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 29 Oct 2012 08:06:46 +0000 (09:06 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 29 Oct 2012 08:06:46 +0000 (09:06 +0100)
1  2 
setup.py patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
sfa