]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of gitlab.com:yomguy/vertigo into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Feb 2017 14:10:29 +0000 (15:10 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Feb 2017 14:10:29 +0000 (15:10 +0100)

Trivial merge