projects / supertux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1e6025 e5a1dac)
Merge branch 'feature/gamecontroller'
authorIngo Ruhnke <grumbel@gmail.com>
Wed, 6 Aug 2014 21:36:05 +0000 (23:36 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Wed, 6 Aug 2014 21:36:05 +0000 (23:36 +0200)

Trivial merge
SVN import of the official repository.