]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into release/1.7
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Apr 2017 16:23:13 +0000 (18:23 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Apr 2017 16:23:13 +0000 (18:23 +0200)

Trivial merge