]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 6 Mar 2017 11:55:54 +0000 (12:55 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 6 Mar 2017 11:55:54 +0000 (12:55 +0100)

Trivial merge