git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ba188d 7766ddd)
Merge branch 'master' of git://git.onelab.eu/sfa into upmc
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 6 Nov 2012 21:48:00 +0000 (22:48 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 6 Nov 2012 21:48:00 +0000 (22:48 +0100)
1  2 
setup.py patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
sfa