]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3144c8 99f675e)
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)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.