projects / supertux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b1d961 3f77e6f)
Merge branch 'master' of https://code.google.com/p/supertux
authorMathnerd314 <mathnerd314.gph+hs@gmail.com>
Sun, 3 Aug 2014 18:33:52 +0000 (20:33 +0200)
committerMathnerd314 <mathnerd314.gph+hs@gmail.com>
Sun, 3 Aug 2014 18:33:52 +0000 (20:33 +0200)
Conflicts:
CMakeLists.txt


Trivial merge
SVN import of the official repository.