Merge branch 'vehicle_repair_costs-sx' into jgrpp

Conflicts: src/lang/english.txt src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/settings_type.h
2015-08-04 23:59:12 +01:00
parent 7a3fb02d5a 6bb8d5087d
commit 20e2f363f1
11 changed files with 96 additions and 0 deletions
--- a/src/saveload/extended_ver_sl.h
+++ b/src/saveload/extended_ver_sl.h
@@ -31,6 +31,7 @@ enum SlXvFeatureIndex {
 	XLSFI_IMPROVED_BREAKDOWNS,                    ///< Improved breakdowns patch
 	XSLFI_TT_WAIT_IN_DEPOT,                       ///< Timetabling waiting time in depot patch
 	XSLFI_AUTO_TIMETABLE,                         ///< Auto timetables and separation patch
+	XSLFI_VEHICLE_REPAIR_COST,                    ///< Vehicle repair costs patch

 	XSLFI_SIZE,                                   ///< Total count of features, including null feature
 };