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 0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp ... # Conflicts: # config.lib # projects/openttd_vs100.vcxproj # projects/openttd_vs100.vcxproj.filters # projects/openttd_vs80.vcproj # projects/openttd_vs90.vcproj # src/order_gui.cpp # src/order_type.h # src/saveload/afterload.cpp # src/saveload/extended_ver_sl.cpp		6 years ago
..
api	Merge branch 'more_cond_orders-sx' into jgrpp	6 years ago
script_config.cpp	Fix #6892: [Script] CONFIG_RANDOM did not use the full parameter range (#6902)	6 years ago
script_config.hpp	…
script_fatalerror.hpp	…
script_info.cpp	…
script_info.hpp	…
script_info_dummy.cpp	Fix: Remove various dead or unnecessary assignments	6 years ago
script_instance.cpp	…
script_instance.hpp	…
script_scanner.cpp	Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32	6 years ago
script_scanner.hpp	…
script_storage.hpp	…
script_suspend.hpp	…
squirrel.cpp	Fix 6accbf9: Silence warnings about unused fread() result	6 years ago
squirrel.hpp	…
squirrel_class.hpp	…
squirrel_helper.hpp	…
squirrel_helper_type.hpp	…
squirrel_std.cpp	…
squirrel_std.hpp	…