]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
authorJérémy Fabre <Jeremy@iMacdeJeremy2.fritz.box>
Tue, 7 Feb 2017 16:57:26 +0000 (17:57 +0100)
committerJérémy Fabre <Jeremy@iMacdeJeremy2.fritz.box>
Tue, 7 Feb 2017 16:57:26 +0000 (17:57 +0100)

Trivial merge