]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Dec 2017 22:55:17 +0000 (23:55 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Dec 2017 22:55:17 +0000 (23:55 +0100)

Trivial merge