]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 22:45:36 +0000 (00:45 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 22:45:36 +0000 (00:45 +0200)

Trivial merge