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 cfebbfac8c Merge branch 'master' into jgrpp ... # Conflicts: # src/autoreplace_cmd.cpp # src/company_base.h # src/company_gui.cpp # src/cpu.cpp # src/debug.h # src/group.h # src/group_cmd.cpp # src/house.h # src/industry.h # src/newgrf_house.cpp # src/news_type.h # src/openttd.cpp # src/saveload/company_sl.cpp # src/settings_type.h # src/sl/oldloader_sl.cpp # src/story.cpp # src/table/town_land.h # src/viewport.cpp		4 months ago
..
CMakeLists.txt	Test: Add upstream tests	6 months ago
bitmath_func.cpp	Bitmath: Add utility functions for calculating bit masks	4 months ago
landscape_partial_pixel_z.cpp	Test: Add upstream tests	6 months ago
math_func.cpp	Remove: LeastCommonMultiple / GreatestCommonDivisor	4 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	4 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