]> 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@iMac-de-Jeremy-2.fritz.box>
Tue, 14 Feb 2017 10:53:05 +0000 (11:53 +0100)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy-2.fritz.box>
Tue, 14 Feb 2017 10:53:05 +0000 (11:53 +0100)

Trivial merge