]> git.parisson.com Git - telemeta.git/commit
fix conflict
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 4 Apr 2016 20:27:35 +0000 (22:27 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 4 Apr 2016 20:27:35 +0000 (22:27 +0200)
commit37f7da63c7847bfd127e7d521f443903c8c9b3ea
tree51feb1e179314326b54d15af667417291aaebc36
parent9ee63ec6512e57950b7694329c8386aa124ec5ac
fix conflict
README.rst