]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
authorEmilie <zawadzki@ircam.fr>
Wed, 15 Feb 2017 16:49:16 +0000 (17:49 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 15 Feb 2017 16:49:16 +0000 (17:49 +0100)

Trivial merge