Merge branch 'master' into PR/simplify_emscripten
authorPaul Brossier <piem@piem.org>
Sat, 30 Sep 2017 18:22:13 +0000 (20:22 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 30 Sep 2017 18:22:13 +0000 (20:22 +0200)
commit23facacbd4fc1fee9c867190ae831a379eed4a72
treeae1c57cf63673408b18a781d5a817886508af266
parent9fabad58e523935b4614f4f3754b63b2f3a04c5c
parent5b679ba15fcc7ab1b381e4c0f97d4f401a16e14e
Merge branch 'master' into PR/simplify_emscripten