]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c59303 c143143)
Merge branch 'dev' into feature/dj1.8
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 20 Oct 2015 21:50:47 +0000 (23:50 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 20 Oct 2015 21:50:47 +0000 (23:50 +0200)
1  2 
setup.py patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.