From: Paul Brossier <piem@piem.org>
Date: Fri, 22 Mar 2013 18:31:06 +0000 (-0500)
Subject: merge from develop
X-Git-Tag: 0.4.0-beta1~110^2~22^2~1^2~6
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=54a2ca2f34f36fd9fedb79b07575541a68eee65c;p=aubio.git

merge from develop
---

54a2ca2f34f36fd9fedb79b07575541a68eee65c
diff --cc src/aubio.h
index 226c59b8,7a275679..b0d8ff81
--- a/src/aubio.h
+++ b/src/aubio.h
@@@ -184,7 -184,7 +184,8 @@@ extern "C
  #include "tempo/tempo.h"
  #include "io/source.h"
  #include "io/sink.h"
 +#include "io/audio_unit.h"
+ #include "synth/sampler.h"
  
  #if AUBIO_UNSTABLE
  #include "mathutils.h"