]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into ThomasBalastegui-dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 20 May 2016 15:56:22 +0000 (17:56 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 20 May 2016 15:56:22 +0000 (17:56 +0200)

Trivial merge