]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 8 Nov 2016 14:41:33 +0000 (15:41 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 8 Nov 2016 14:41:33 +0000 (15:41 +0100)

Trivial merge