]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 6 Jun 2017 12:30:03 +0000 (14:30 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 6 Jun 2017 12:30:03 +0000 (14:30 +0200)

Trivial merge