]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie <zawadzki@ircam.fr>
Tue, 8 Nov 2016 16:26:31 +0000 (17:26 +0100)
committerEmilie <zawadzki@ircam.fr>
Tue, 8 Nov 2016 16:26:31 +0000 (17:26 +0100)

Trivial merge