projects / supertux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b641d01 db5b2cd)
Merge branch 'feature/surface-scaling'
authorIngo Ruhnke <grumbel@gmail.com>
Sat, 16 Aug 2014 19:56:08 +0000 (21:56 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Sat, 16 Aug 2014 19:56:08 +0000 (21:56 +0200)

Trivial merge
SVN import of the official repository.