]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3045c08 810f1bc)
Merge branch 'dev' into feature/haystack
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 20 Jan 2016 20:51:37 +0000 (21:51 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 20 Jan 2016 20:51:37 +0000 (21:51 +0100)

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