projects / supertux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dae274f 76c0dd8)
Merge branch 'master' of https://code.google.com/p/supertux
authorMathnerd314 <mathnerd314.gph+hs@gmail.com>
Sun, 3 Aug 2014 18:29:32 +0000 (20:29 +0200)
committerMathnerd314 <mathnerd314.gph+hs@gmail.com>
Sun, 3 Aug 2014 18:29:32 +0000 (20:29 +0200)
commit8b1d96110cb224d711749dccba18dd0d86ded20c
tree405edf1f78d8cbc62dc956bc7c1c280ed59e354ftree | snapshot
parentdae274f7bc4ae7914207586dd7e7b1cfc5f3a98fcommit | diff
parent76c0dd8b3bac15d407b8e84e09a416b098d6a3c7commit | diff
Merge branch 'master' of https://code.google.com/p/supertux

Conflicts:
src/supertux/main.cpp

Modified CMakeLists.txt to actually build properly
CMakeLists.txt diff1 | diff2 | blob | history
SVN import of the official repository.