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

Trivial merge
Rocks'n'Diamonds