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.
OpenTTD-patches/cmake/scripts
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
..
Baseset.cmake
CreateGRF.cmake
FindVersion.cmake version_utils.sh: Fix getting current version 4 years ago
GenerateWidget.cmake Change: rewrote generate_widget in CMake 4 years ago
Regression.cmake Fix: [CMake] Don't strip final newline from regression output. 4 years ago
SquirrelExport.cmake Change: rewrote squirrel_export in CMake 4 years ago
SquirrelIncludes.cmake Change: rewrote squirrel_export in CMake 4 years ago