merged trunk into 4.2 branch
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 23 Sep 2008 11:29:47 +0000 (11:29 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 23 Sep 2008 11:29:47 +0000 (11:29 +0000)
commit2ba3378ede9479e249b80f59061ab74d97ffefc3
tree4b5ff40a2914cff0434a59b96d9c5f196f37bfe9
parent270af8c185bfc682ae92273dd7433b73fde566d7
merged trunk into 4.2 branch
system/TestPlc.py
system/TestSlice.py