]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalaste...
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 12 May 2016 15:25:56 +0000 (17:25 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 12 May 2016 15:25:56 +0000 (17:25 +0200)

Trivial merge