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)
commit3bdde1dc2696340bee5f52dea1d8f288700f62b9
tree23caab4c8b88ae475eee5f06a75254fd6c22644d
parent8b1d96110cb224d711749dccba18dd0d86ded20c
parent3f77e6f5df27e7aff5a5f9071a04685f416e7f24
Merge branch 'master' of https://code.google.com/p/supertux

Conflicts:
CMakeLists.txt