]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0e72ea fd8e5ab)
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorThomas Fillon <thomas@parisson.com>
Thu, 17 Jul 2014 07:59:14 +0000 (09:59 +0200)
committerThomas Fillon <thomas@parisson.com>
Thu, 17 Jul 2014 07:59:14 +0000 (09:59 +0200)
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.