]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dd9849 0bce9c3)
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 17 Sep 2017 21:51:22 +0000 (23:51 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 17 Sep 2017 21:51:22 +0000 (23:51 +0200)

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