git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 232e312 6fb6722)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 7 Jun 2012 09:17:34 +0000 (11:17 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 7 Jun 2012 09:17:34 +0000 (11:17 +0200)
1  2 
sfa.spec patch | diff1 | diff2 | blob | history

diff --cc sfa.spec
Simple merge
sfa