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 6c3e5642f8 Merge branch 'master' into jgrpp ... # Conflicts: # cmake/CompileFlags.cmake # src/crashlog.cpp # src/fileio.cpp # src/fileio_func.h # src/fios_gui.cpp # src/ini_load.cpp # src/ini_type.h # src/lang/english.txt # src/lang/german.txt # src/lang/korean.txt # src/network/network_client.cpp # src/order_base.h # src/order_cmd.cpp # src/os/windows/win32.cpp # src/road_cmd.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/settings.cpp # src/station_cmd.cpp # src/stdafx.h # src/table/settings.ini # src/tree_cmd.cpp # src/tree_gui.cpp # src/vehicle_base.h # src/video/cocoa/cocoa_v.mm # src/video/cocoa/event.mm # src/video/cocoa/wnd_quartz.mm # src/viewport.cpp # src/widgets/tree_widget.h		3 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	Add third DoCommand parameter p3	4 years ago
game_instance.hpp	Cleanup: Removed SVN headers	5 years ago
game_scanner.cpp	Codechange: use C++11 constructs for for-each loops (#8432)	4 years ago
game_scanner.hpp	Cleanup: Removed SVN headers	5 years ago
game_text.cpp	Codechange: Use std::string in file scanners.	3 years ago
game_text.hpp	Codechange: Store GS lang texts in std::strings.	4 years ago