From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 6 Nov 2011 20:15:13 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~312^2~4^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a8d895c1315a02001b6bd6f393232fa07aa810ea

Merge branch 'master' into senslab2
---

a8d895c1315a02001b6bd6f393232fa07aa810ea
diff --cc setup.py
index 6e021aba,a9735a0b..c3285ebd
--- a/setup.py
+++ b/setup.py
@@@ -43,10 -43,8 +43,9 @@@ package_dirs = 
      'sfa/methods',
      'sfa/generic',
      'sfa/managers',
-     'sfa/managers/vini',
      'sfa/importer',
      'sfa/plc',
 +    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',