Merge branch 'feature/dct_multiopt'
authorPaul Brossier <piem@piem.org>
Sat, 15 Sep 2018 15:31:46 +0000 (17:31 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 15 Sep 2018 15:31:46 +0000 (17:31 +0200)
commitad3770fa5f1372e5908805f6024ef3c4541d13ed
tree78ba6be5cc10f818abc689a2e9732c35ccc8f768
parent87e181df6f9eef5cb2d7f9e3fee96f3f6b6f46f3
parent3cb2a52afc6c3cd85b1fdcb9dddbd128edfb9f15
Merge branch 'feature/dct_multiopt'