]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37a6b38 2635de5)
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 10 Nov 2013 08:16:34 +0000 (09:16 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 10 Nov 2013 08:16:34 +0000 (09:16 +0100)
Conflicts:
doc/source/news.rst


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.