]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ad9e2d f7ff54d)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 18 Oct 2013 23:44:49 +0000 (01:44 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 18 Oct 2013 23:44:49 +0000 (01:44 +0200)

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