Merge branch 'master' into feature/timestretch
authorPaul Brossier <piem@piem.org>
Thu, 2 Jul 2020 13:39:25 +0000 (15:39 +0200)
committerPaul Brossier <piem@piem.org>
Thu, 2 Jul 2020 13:39:25 +0000 (15:39 +0200)
1  2 
.travis.yml
wscript

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