]> 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>
Thu, 9 Feb 2017 09:31:48 +0000 (10:31 +0100)
committerJérémy Fabre <Jeremy@iMac-de-Jeremy-2.fritz.box>
Thu, 9 Feb 2017 09:31:48 +0000 (10:31 +0100)

Trivial merge