]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17649fc 9875314)
Merge branch 'DavidDoukhan-diadems' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 16:15:36 +0000 (18:15 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 16:15:36 +0000 (18:15 +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.