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 7f6b1d6b94 Merge branch 'master' into jgrpp ... # Conflicts: # src/company_cmd.cpp # src/company_func.h # src/core/overflowsafe_type.hpp # src/engine.cpp # src/music/midifile.cpp # src/network/network_command.cpp # src/newgrf_debug_gui.cpp # src/newgrf_roadstop.h # src/newgrf_spritegroup.cpp # src/os/macosx/crashlog_osx.cpp # src/os/unix/crashlog_unix.cpp # src/pathfinder/yapf/yapf_common.hpp # src/road_gui.cpp # src/saveload/engine_sl.cpp # src/script/api/script_depotlist.cpp # src/script/api/script_roadtypelist.cpp # src/settings_gui.cpp # src/settings_type.h # src/strings.cpp # src/table/settings/game_settings.ini		5 months ago
..
CMakeLists.txt	Change: [Network] Transfer command data as serialized byte stream without fixed structure.	2 years ago
array.hpp	Merge branch 'master' into jgrpp	5 months ago
binaryheap.hpp	Fix: Globally apply preprocessor directive coding style	4 years ago
countedobj.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
countedptr.hpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
dbg_helpers.cpp	Merge branch 'master' into jgrpp	6 months ago
dbg_helpers.h	Merge branch 'master' into jgrpp	5 months ago
fixedsizearray.hpp	Codechange: coding style fixes	5 months ago
getoptdata.cpp	Cleanup: Removed SVN headers	5 years ago
getoptdata.h	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
hashtable.hpp	Merge branch 'master' into jgrpp	5 months ago
lrucache.hpp	Codechange: Move includes for common STL headers to stdafx.	1 year ago