From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 11 Oct 2013 23:07:15 +0000 (+0200)
Subject: Merge branch 'diadems' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=860defb8b50799fff7b10cb861b81b14dbd564d8;p=timeside-diadems.git

Merge branch 'diadems' into dev

Conflicts:
	timeside/analyzer/__init__.py
---

860defb8b50799fff7b10cb861b81b14dbd564d8
diff --cc timeside/analyzer/__init__.py
index 6f13282,ab43ac7..e8962ce
--- a/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@@ -7,7 -7,5 +7,9 @@@ from aubio_pitch import 
  from aubio_mfcc import *
  from aubio_melenergy import *
  from aubio_specdesc import *
 +from yaafe import * # TF : add Yaafe analyzer
 +from spectrogram import Spectrogram
 +from waveform import Waveform
- from vamp_plugin import VampSimpleHost
++from vamp_plugin import VampSimpleHost
+ from irit_speech_entropy import *
+ from irit_speech_4hz import *