]> 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, 22 Feb 2017 13:30:22 +0000 (14:30 +0100)
committerJérémy Fabre <blackmagik88@gmail.com>
Wed, 22 Feb 2017 13:30:22 +0000 (14:30 +0100)

Trivial merge