]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bea0b8 f51f2ee)
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 11 Feb 2016 16:37:17 +0000 (17:37 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 11 Feb 2016 16:37:17 +0000 (17:37 +0100)

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