]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 24 Aug 2017 16:27:44 +0000 (18:27 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 24 Aug 2017 16:27:44 +0000 (18:27 +0200)

Trivial merge