Merge branch 'master' into feature/pitchshift feature/pitchshift
authorPaul Brossier <piem@piem.org>
Sun, 31 Mar 2019 23:30:06 +0000 (01:30 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 31 Mar 2019 23:30:06 +0000 (01:30 +0200)
1  2 
.travis.yml
python/lib/moresetuptools.py
wscript

diff --cc .travis.yml
Simple merge
Simple merge
diff --cc wscript
Simple merge