]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into release/1.7
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 27 Jul 2018 12:09:09 +0000 (14:09 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 27 Jul 2018 12:09:09 +0000 (14:09 +0200)

Trivial merge