]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f9ebbc 5931256)
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 9 Jan 2017 23:21:21 +0000 (00:21 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 9 Jan 2017 23:21:21 +0000 (00:21 +0100)

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