]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie <zawadzki@ircam.fr>
Thu, 29 Dec 2016 13:18:11 +0000 (14:18 +0100)
committerEmilie <zawadzki@ircam.fr>
Thu, 29 Dec 2016 13:18:11 +0000 (14:18 +0100)

Trivial merge