]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
authorJérémy Fabre <blackmagik88@gmail.com>
Wed, 15 Feb 2017 16:14:05 +0000 (17:14 +0100)
committerJérémy Fabre <blackmagik88@gmail.com>
Wed, 15 Feb 2017 16:14:05 +0000 (17:14 +0100)

Trivial merge