]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 15 Feb 2017 17:46:43 +0000 (18:46 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 15 Feb 2017 17:46:43 +0000 (18:46 +0100)

Trivial merge