git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bffe83c 5d79c38)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 20 Nov 2011 09:07:49 +0000 (10:07 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 20 Nov 2011 09:07:49 +0000 (10:07 +0100)
1  2 
sfa.spec patch | diff1 | diff2 | blob | history

diff --cc sfa.spec
Simple merge
sfa