]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 11 May 2016 09:42:21 +0000 (11:42 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 11 May 2016 09:42:21 +0000 (11:42 +0200)

Trivial merge