From: yomguy <yomguy@parisson.com>
Date: Sat, 6 Oct 2012 12:54:45 +0000 (+0200)
Subject: Merge branch 'dev' into aubio
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f6709ec7fb3dca534f572263c1bee3005c08fc5b;p=timeside-diadems.git

Merge branch 'dev' into aubio
---

f6709ec7fb3dca534f572263c1bee3005c08fc5b
diff --cc timeside/analyzer/__init__.py
index 504d50f,0d05ae7..f8633db
--- a/timeside/analyzer/__init__.py
+++ b/timeside/analyzer/__init__.py
@@@ -3,9 -3,5 +3,7 @@@
  from max_level import *
  from mean_level import *
  from dc import *
 +from aubio_bpm import *
 +from aubio_onsetrate import *
  
+