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

Merge branch 'thgeneric' into senslab2
---

4fbc1c51ef8033e5305156ded6b8a3f6c9d921bf
diff --cc setup.py
index d6fd9e16,698b3883..6e021aba
--- a/setup.py
+++ b/setup.py
@@@ -44,8 -44,8 +44,9 @@@ package_dirs = 
      'sfa/generic',
      'sfa/managers',
      'sfa/managers/vini',
+     'sfa/importer',
      'sfa/plc',
 +    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',