From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 3 Nov 2011 14:59:18 +0000 (+0100)
Subject: merged master onto senslab2, manually solved conflicts in setup.py
X-Git-Tag: sfa-2.1-24~3^2~312^2~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=70f4308757e799aeb96545f5e0a22c96dc8633c2;p=sfa.git

merged master onto senslab2, manually solved conflicts in setup.py
(under control) and rspec.py (now in sfa/rspecs), the latter being the
mainstream version as is
---

70f4308757e799aeb96545f5e0a22c96dc8633c2
diff --cc setup.py
index 921139c1,c28e38da..d6fd9e16
--- a/setup.py
+++ b/setup.py
@@@ -36,17 -36,18 +36,19 @@@ bins = 
  
  package_dirs = [
      'sfa', 
-     'sfa/client',
-     'sfa/methods',
-     'sfa/plc',
-     'sfa/senslab',
-     'sfa/server',
      'sfa/trust',
      'sfa/util', 
+     'sfa/client',
+     'sfa/server',
+     'sfa/methods',
+     'sfa/generic',
      'sfa/managers',
      'sfa/managers/vini',
+     'sfa/plc',
++    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
+     'sfa/rspecs/elements/versions',
      'sfa/rspecs/versions',
      'sfatables',
      'sfatables/commands',