git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d550a4b 0b3477f)
Merge branch 'upstreammaster' into senslab2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Jan 2013 22:08:51 +0000 (23:08 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 24 Jan 2013 22:08:51 +0000 (23:08 +0100)
1  2 
setup.py patch | diff1 | diff2 | blob | history
sfa/client/sfi.py patch | diff1 | diff2 | blob | history
sfa/managers/registry_manager.py patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
diff --cc sfa/client/sfi.py
Simple merge
diff --cc sfa/managers/registry_manager.py
Simple merge
sfa