]> 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, 8 Feb 2017 11:28:48 +0000 (12:28 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 8 Feb 2017 11:28:48 +0000 (12:28 +0100)

Trivial merge