git://git.onelab.eu / tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04ae73b 176b186)
Merge branch 'master' into sfa-geni-v3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 17 Apr 2013 07:29:10 +0000 (09:29 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 17 Apr 2013 07:29:10 +0000 (09:29 +0200)
1  2 
system/TestPlc.py patch | diff1 | diff2 | blob | history
system/TestSliceSfa.py patch | diff1 | diff2 | blob | history

diff --cc system/TestPlc.py
Simple merge
diff --cc system/TestSliceSfa.py
Simple merge
tests