projects / rocksndiamonds.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc44576 07e47c9)
Merge branch 'master' into releases releases 3.3.1.2
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:08 +0000 (11:00 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:08 +0000 (11:00 +0200)

Trivial merge
Rocks'n'Diamonds