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

Trivial merge