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	Add: introduce CMake for project management	4 years ago
md5.cpp	Merge branch 'master' into jgrpp	5 months ago
md5.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago