projects / rocksndiamonds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61b7a65 5f4853f)
Merge branch 'master' into releases 3.0.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:05 +0000 (10:43 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:05 +0000 (10:43 +0200)

Trivial merge
Rocks'n'Diamonds