Commit Graph

3 Commits (bc67c0f179577343178d0d3af898bfdd2e7ee3ff)

Author SHA1 Message Date
Jonathan G Rennison 5b36c1db11 Merge branch 'master' into jgrpp
# Conflicts:
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/core/geometry_func.hpp
#	src/disaster_vehicle.cpp
#	src/dropdown.cpp
#	src/dropdown_func.h
#	src/engine_gui.h
#	src/genworld_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_airport.h
#	src/newgrf_engine.cpp
#	src/order_gui.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/town_sl.cpp
#	src/slider_func.h
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/airport_defaults.h
#	src/tilematrix_type.hpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/video/sdl_v.cpp
1 month ago
Rubidium 0b50834f81 Fix 2955ff3: CMake atomic check fails due to chosen compiler 5 months ago
James Addison c17fa6032b
Doc: Add Apache 2.0 licensing info for CheckAtomic.cmake (#12603) 5 months ago