]> git.parisson.com Git - mezzo.git/commitdiff
herge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 14 Oct 2016 14:55:26 +0000 (16:55 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 14 Oct 2016 14:55:26 +0000 (16:55 +0200)

Trivial merge