]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03e8fcd 4c21264)
Merge Dev into current branch
authorThomas Fillon <thomas@parisson.com>
Tue, 27 May 2014 11:31:56 +0000 (13:31 +0200)
committerThomas Fillon <thomas@parisson.com>
Tue, 27 May 2014 11:31:56 +0000 (13:31 +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.