]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7aad2e8 5edd6e5)
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 7 Jul 2014 22:25:34 +0000 (00:25 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 7 Jul 2014 22:25:34 +0000 (00:25 +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.