]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c02cb78 cdef527)
Merge branch 'crem' of github.com:Parisson/Telemeta into crem
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Jan 2016 10:34:18 +0000 (11:34 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Jan 2016 10:34:18 +0000 (11:34 +0100)
Conflicts:
telemeta/pages


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