]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90cda4b 267452b)
Merge branch 'dev' 1.6.2
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 8 Jun 2016 22:05:13 +0000 (00:05 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 8 Jun 2016 22:05:13 +0000 (00:05 +0200)
Conflicts:
README.rst
app/scripts/app.sh


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