]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 14:14:47 +0000 (16:14 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 14:14:47 +0000 (16:14 +0200)
commit317d200851835f7de496d537c47ec15195a40a88
treec653fad66cf493b9f6ea0116ce2ef1086f2b3a36
parenta5f782006eb8cb0a8cfe48b7b13d88226447cf1a
parentfe0fe7e9ebcd979182473d60f3260f2b8778ef6e
Merge branch 'dev'