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

Trivial merge
Rocks'n'Diamonds