projects / aubio.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71f2e5f 67b6618)
Merge 'origin/master' into sampler
authorPaul Brossier <piem@piem.org>
Sun, 12 Mar 2017 10:26:24 +0000 (11:26 +0100)
committerPaul Brossier <piem@piem.org>
Sun, 12 Mar 2017 10:26:24 +0000 (11:26 +0100)
commit41b985f1e3468fe8547f44c2ae6b38f2a437a3f3
treef04cabbc533fb4c9b90b72743213320ed77080ebtree | snapshot
parent71f2e5faa3bd20d27ef2de8776d6ccfc2b6d8688commit | diff
parent67b66184a3c5ac1bc2d2bc837bc5b1f192f10b15commit | diff
Merge 'origin/master' into sampler

Conflicts:
.travis.yml
Makefile
examples/aubionotes.c
examples/parse_args.h
python/demos/demo_timestretch_online.py
python/lib/moresetuptools.py
python/tests/test_source.py
setup.py
src/io/source.c
.travis.yml diff1 | diff2 | blob | history
python/lib/gen_external.py diff1 | diff2 | blob | history
python/lib/moresetuptools.py diff1 | diff2 | blob | history
src/aubio.h diff1 | diff2 | blob | history
src/synth/sampler.c diff1 | diff2 | blob | history
src/wscript_build diff1 | diff2 | blob | history
wscript diff1 | diff2 | blob | history
a library for audio labeling