From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Fri, 25 Nov 2011 09:43:36 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~269
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=bb57cb30c7cfdddcf8e55fd7084e3cdaf67eaac4;hp=-c

Merge branch 'master' into senslab2
---

bb57cb30c7cfdddcf8e55fd7084e3cdaf67eaac4
diff --combined setup.py
index c3285ebd,0c02f323..98d07a8c
--- a/setup.py
+++ b/setup.py
@@@ -45,7 -45,6 +45,7 @@@ package_dirs = 
      'sfa/managers',
      'sfa/importer',
      'sfa/plc',
 +    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',
@@@ -53,7 -52,6 +53,6 @@@
      'sfatables',
      'sfatables/commands',
      'sfatables/processors',
-     'flashpolicy',
      ]