Merge branch 'master' into feature/autosink
authorPaul Brossier <piem@piem.org>
Sun, 31 Mar 2019 21:12:40 +0000 (23:12 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 31 Mar 2019 21:12:40 +0000 (23:12 +0200)
1  2 
.travis.yml
azure-pipelines.yml
src/io/sink.c
wscript

diff --cc .travis.yml
Simple merge
Simple merge
diff --cc src/io/sink.c
Simple merge
diff --cc wscript
Simple merge