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 0d93ecb6bf Merge branch 'master' into jgrpp ... # Conflicts: # src/core/alloc_type.hpp # src/group_gui.cpp # src/newgrf.cpp # src/saveload/economy_sl.cpp # src/saveload/map_sl.cpp # src/station_cmd.cpp		5 years ago
..
api	Merge branch 'master' into jgrpp	5 years ago
script_config.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_config.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_fatalerror.hpp	…
script_info.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_info.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_info_dummy.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_instance.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_instance.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_scanner.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_scanner.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_storage.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
script_suspend.hpp	…
squirrel.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
squirrel.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
squirrel_class.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
squirrel_helper.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
squirrel_helper_type.hpp	Fix: MSVC warnings (#7423)	5 years ago
squirrel_std.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
squirrel_std.hpp	(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)	12 years ago