git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0505ed9 83e1154)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 25 Oct 2011 14:41:40 +0000 (16:41 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 25 Oct 2011 14:41:40 +0000 (16:41 +0200)
1  2 
sfa/managers/aggregate_manager.py patch | diff1 | diff2 | blob | history
sfa/managers/aggregate_manager_vini.py patch | diff1 | diff2 | blob | history
sfa/managers/slice_manager.py patch | diff1 | diff2 | blob | history

diff --cc sfa/managers/aggregate_manager.py
Simple merge
diff --cc sfa/managers/slice_manager.py
Simple merge
sfa