]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7333bf6 de9ab99)
Merge branch 'dev' 1.6
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 4 Apr 2016 21:59:10 +0000 (23:59 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 4 Apr 2016 21:59:10 +0000 (23:59 +0200)

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