]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5f7820 fe0fe7e)
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 14:14:47 +0000 (16:14 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 14:14:47 +0000 (16:14 +0200)

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