git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a4bcb0 fec2b28)
solve merge conflict
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 31 Oct 2011 18:31:42 +0000 (19:31 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 31 Oct 2011 18:31:42 +0000 (19:31 +0100)

Trivial merge
sfa