From: Paul Brossier <piem@piem.org>
Date: Sun, 27 Oct 2013 11:44:29 +0000 (+0100)
Subject: Merge branch 'develop' of aubio.org:/git/aubio/aubio into wavetable
X-Git-Tag: 0.4.0-beta1~110
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=dc467b5d5a7c321235d4defb3ce8541e70460fc9;p=aubio.git

Merge branch 'develop' of aubio.org:/git/aubio/aubio into wavetable
---

dc467b5d5a7c321235d4defb3ce8541e70460fc9
diff --cc src/aubio.h
index a8d6841f,59133d1d..5f8b518a
--- a/src/aubio.h
+++ b/src/aubio.h
@@@ -184,8 -184,8 +184,9 @@@ extern "C
  #include "tempo/tempo.h"
  #include "io/source.h"
  #include "io/sink.h"
+ #include "io/audio_unit.h"
  #include "synth/sampler.h"
 +#include "synth/wavetable.h"
  
  #if AUBIO_UNSTABLE
  #include "mathutils.h"