]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/html5
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 2 Jun 2017 11:12:42 +0000 (13:12 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 2 Jun 2017 11:12:42 +0000 (13:12 +0200)
commit50c38cfc3321803b44431016ec176ab203fa4324
treececa253f55835512b9ccfeb4a81e661af2b556fc
parente3144c8e6ce4b64ba07099de2e1ab0360b444281
parent99f675e0ab1dc3766ca137b414e4895cfbcbd8e0
Merge branch 'dev' into feature/html5