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 822ecae85d Merge branch 'master' into jgrpp ... # Conflicts: # src/cargotype.h # src/core/CMakeLists.txt # src/core/span_type.hpp # src/fileio.cpp # src/fios.cpp # src/misc/endian_buffer.hpp # src/misc_gui.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/screenshot.cpp # src/settings.cpp # src/settings_internal.h # src/stdafx.h # src/string_func.h # src/strings.cpp # src/strings_func.h # src/strings_internal.h		5 months ago
..
CMakeLists.txt	Test: Add upstream tests	6 months ago
bitmath_func.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
landscape_partial_pixel_z.cpp	Test: Add upstream tests	6 months ago
math_func.cpp	Test: Add upstream tests	6 months ago
mock_environment.h	Test: Add upstream tests	6 months ago
mock_fontcache.h	Change: Allow TrueType fonts to provide our private-use glyphs.	5 months ago
mock_spritecache.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
mock_spritecache.h	Test: Add upstream tests	6 months ago
ring_buffer.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
string_func.cpp	Merge branch 'master' into jgrpp	5 months ago
strings_func.cpp	Test: Add upstream tests	6 months ago
test_main.cpp	Test: Add upstream tests	6 months ago
test_script_admin.cpp	Test: Add upstream tests	6 months ago
test_window_desc.cpp	Merge branch 'master' into jgrpp	5 months ago