Merge branch 'progsig-sx' into jgrpp

Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:15:18 +01:00
31 changed files with 2914 additions and 115 deletions

View File

@@ -22,6 +22,7 @@
enum SlXvFeatureIndex {
XSLFI_NULL = 0, ///< Unused value, to indicate that no extended feature test is in use
XSLFI_TRACE_RESTRICT, ///< Trace restrict
XSLFI_PROG_SIGS, ///< programmable signals patch
XSLFI_SIZE, ///< Total count of features, including null feature
};