]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 976e27d 21fd84d)
Merge branch 'dev' into crem
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 21 Dec 2015 11:13:15 +0000 (12:13 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 21 Dec 2015 11:13:15 +0000 (12:13 +0100)

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