]> 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>
Thu, 16 Mar 2017 12:41:49 +0000 (13:41 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 16 Mar 2017 12:41:49 +0000 (13:41 +0100)

Trivial merge