From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 16 Dec 2014 16:36:43 +0000 (+0100)
Subject: Merge dev into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9b3d27c75580d83b4d7eb9446bfaf30563a9b21c;p=timeside.git

Merge dev into diadems
---

9b3d27c75580d83b4d7eb9446bfaf30563a9b21c
diff --cc setup.py
index f925882,e7f1396..e24d0df
--- a/setup.py
+++ b/setup.py
@@@ -61,14 -60,9 +61,12 @@@ setup
          'django-extensions',
          'djangorestframework',
          'south',
 +        'py_sonicvisualiser',
 +        'pyannote.core',
 +        'pyannote.features',
          'traits',
          'networkx',
-         'sphinx_rtd_theme',
-     ],
- 
+         ],
      platforms=['OS Independent'],
      license='Gnu Public License V2',
      classifiers=CLASSIFIERS,