]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 29 Mar 2018 13:14:50 +0000 (15:14 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 29 Mar 2018 13:14:50 +0000 (15:14 +0200)

Trivial merge