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 838b166726 Merge branch 'master' into jgrpp ... # Conflicts: # src/cheat_gui.cpp # src/command.cpp # src/command_func.h # src/company_base.h # src/debug.cpp # src/debug.h # src/economy.cpp # src/engine_type.h # src/graph_gui.cpp # src/misc_cmd.cpp # src/misc_cmd.h # src/network/core/os_abstraction.cpp # src/openttd.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/settings_type.h # src/ship_cmd.cpp # src/stdafx.h # src/tests/bitmath_func.cpp # src/town_cmd.cpp # src/town_gui.cpp		3 months ago
..
CMakeLists.txt	Codechange: Simplify SetBitIterator	4 months ago
bitmath_func.cpp	Merge branch 'master' into jgrpp	3 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