]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Apr 2016 14:59:00 +0000 (16:59 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Apr 2016 14:59:00 +0000 (16:59 +0200)
commitb2d754b647e76d11cd206e1c3a1fdc3994bc36d3
treeadbed59795dd139aec1acc3e6dc3b23d7035fcab
parent2b885bca82a49d8230f407cfff6f61a334ec4c9e
parentab86388246e23b1666cacfe73747252ab7421a49
Merge branch 'master' into dev