]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 23 Feb 2016 00:08:22 +0000 (01:08 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 23 Feb 2016 00:08:22 +0000 (01:08 +0100)
commit4685527e3e7b5fe5786b4496430871d762d39505
tree1d9a07ef5913102199fa49c1cd853c335acdc102
parentb2ebd297910cbf226c1a83c09f7240a9d0817b15
parenta3a7556be9ae69d241cd94015e8a8b4ea4224b2e
Merge branch 'dev'