git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2323eb5 5dd712d)
merge master again (2.0-10 changelog only)
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 27 Jan 2012 10:36:57 +0000 (11:36 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 27 Jan 2012 10:36:57 +0000 (11:36 +0100)
1  2 
sfa.spec patch | diff1 | diff2 | blob | history

diff --cc sfa.spec
Simple merge
sfa