]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48206b1 3a8d824)
Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
authorThomas Fillon <thomas@parisson.com>
Thu, 12 Dec 2013 14:42:19 +0000 (15:42 +0100)
committerThomas Fillon <thomas@parisson.com>
Thu, 12 Dec 2013 14:42:19 +0000 (15:42 +0100)
1  2 
README.rst patch | diff1 | diff2 | blob | history

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