]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie <zawadzki@ircam.fr>
Thu, 16 Mar 2017 18:35:20 +0000 (19:35 +0100)
committerEmilie <zawadzki@ircam.fr>
Thu, 16 Mar 2017 18:35:20 +0000 (19:35 +0100)

Trivial merge