You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 5b78090a61 Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # src/saveload/town_sl.cpp # src/screenshot.h # src/script/api/ai/ai_date.hpp.sq # src/script/api/ai/ai_marine.hpp.sq # src/script/api/ai/ai_station.hpp.sq # src/script/api/game/game_date.hpp.sq # src/script/api/game/game_marine.hpp.sq # src/script/api/game/game_station.hpp.sq # src/script/api/game/game_window.hpp.sq # src/script/api/script_window.hpp # src/script/api/template/template_window.hpp.sq # src/signal.cpp # src/statusbar_gui.cpp # src/toolbar_gui.cpp # src/viewport.cpp # src/viewport_func.h		4 years ago
..
CMakeLists.txt	Add: introduce CMake for project management	4 years ago
game.hpp	Cleanup: Removed SVN headers	5 years ago
game_config.cpp	Cleanup: Removed SVN headers	5 years ago
game_config.hpp	Cleanup: Removed SVN headers	5 years ago
game_core.cpp	Merge branch 'master' into jgrpp	5 years ago
game_info.cpp	Codechange: Simplify CheckAPIVersion()	4 years ago
game_info.hpp	Cleanup: Removed SVN headers	5 years ago
game_instance.cpp	Change: rewrote squirrel_export in CMake	4 years ago
game_instance.hpp	Cleanup: Removed SVN headers	5 years ago
game_scanner.cpp	Cleanup: Removed SVN headers	5 years ago
game_scanner.hpp	Cleanup: Removed SVN headers	5 years ago
game_text.cpp	Codechange: Store GS lang texts in std::strings.	4 years ago
game_text.hpp	Codechange: Store GS lang texts in std::strings.	4 years ago