]> Nick Gasson's Git Repositories - traingame.git/commit
Fix some merge problems
authorNick Gasson <nick@nickg.me.uk>
Sun, 29 Mar 2009 21:29:30 +0000 (21:29 +0000)
committerNick Gasson <nick@nickg.me.uk>
Sun, 29 Mar 2009 21:29:30 +0000 (21:29 +0000)
commit3d5ab2d889f4c296537b5da1e0888c657a39db93
tree460b2b9d220d424ff646e2ea4a5a7b0e104dd948
parent03cfdbd8d73f6afafa86dd4fd8f514ac584f838f
Fix some merge problems
data/gui/schemes/Trains.scheme
src/Editor.cpp
src/SDLWindow.cpp