From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 14 Feb 2014 16:08:36 +0000 (+0100)
Subject: Merge branch 'dev' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=34fa0ef6f7113d1b12feba9304797564e2a8b6f4;p=timeside.git

Merge branch 'dev' into diadems
---

34fa0ef6f7113d1b12feba9304797564e2a8b6f4
diff --cc timeside/analyzer/__init__.py
index e7a2c8c,27aa32d..c6b78d8
--- a/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@@ -13,8 -13,5 +13,9 @@@ from waveform import Wavefor
  from vamp_plugin import VampSimpleHost
  from irit_speech_entropy import IRITSpeechEntropy
  from irit_speech_4hz import IRITSpeech4Hz
 +from irit_diverg import IRITDiverg
 +from irit_music_SLN import IRITMusicSLN
 +from irit_music_SNB import IRITMusicSNB
 +#~ from irit_monopoly import IRITMonopoly
  from odf import OnsetDetectionFunction
+ from limsi_sad import LimsiSad