]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a555f4a c5caa36)
Merge branch 'dev' into ThomasBalastegui-dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 12 May 2016 15:25:52 +0000 (17:25 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 12 May 2016 15:25:52 +0000 (17:25 +0200)

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