]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 17 Oct 2017 16:12:48 +0000 (18:12 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 17 Oct 2017 16:12:48 +0000 (18:12 +0200)

Trivial merge