]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b885bc ab86388)
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Apr 2016 14:59:00 +0000 (16:59 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Apr 2016 14:59:00 +0000 (16:59 +0200)

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