]> git.parisson.com Git - telemeta.git/commit
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)
commit4b04d999177972c063794160046e7a330267bc39
tree4bf99250da445e9af60386bab7763f6e8d4d7b9e
parent90cda4b91023e364ac873d22869fa967d6f00d2f
parent267452b5b4e40b30be9ca06a22bb5218deeee0ce
Merge branch 'dev'

Conflicts:
README.rst
app/scripts/app.sh