]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie <zawadzki@ircam.fr>
Wed, 15 Mar 2017 10:50:48 +0000 (11:50 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 15 Mar 2017 10:50:48 +0000 (11:50 +0100)

Trivial merge