git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f49ea4 e80e309)
solve conflict in sfa/plc/aggregate.py
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 14 Nov 2011 20:33:26 +0000 (21:33 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 14 Nov 2011 20:33:26 +0000 (21:33 +0100)

Trivial merge
sfa