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

Trivial merge