projects / rocksndiamonds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcb174b 688d5ec)
Merge branch 'master' into releases 2.1.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:38:02 +0000 (10:38 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:38:02 +0000 (10:38 +0200)

Trivial merge
Rocks'n'Diamonds