Merge branch 'master' into sampler
authorPaul Brossier <piem@piem.org>
Mon, 10 Apr 2017 23:49:44 +0000 (01:49 +0200)
committerPaul Brossier <piem@piem.org>
Mon, 10 Apr 2017 23:49:44 +0000 (01:49 +0200)
commitb201912e58690396bd9cadce7c107944f8553e66
tree98cf3ab728f526cee6052c025900513cf62e7e24
parentfbafd2c5488cc94158879f02afa3b310cdb72c08
parentb762f8d4f83c98c4607707c9507c6f7fe6538cf0
Merge branch 'master' into sampler

Fixed conflicts:
python/lib/gen_external.py
src/io/source_avcodec.c
python/lib/gen_external.py
python/lib/moresetuptools.py
src/aubio.h
src/io/source_avcodec.c
wscript