]> 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, 22 Mar 2017 23:28:54 +0000 (00:28 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Mar 2017 23:28:54 +0000 (00:28 +0100)

Trivial merge