]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81e34d1 15f960c)
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 22 Feb 2018 12:20:35 +0000 (13:20 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 22 Feb 2018 12:20:35 +0000 (13:20 +0100)

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