Merge branch 'master' into jgrpp

2016-12-09 00:01:03 +00:00
parent 20a090b077 da76191afc
commit 58381a3ea2
62 changed files with 49 additions and 114 deletions
--- a/src/widgets/autoreplace_widget.h
+++ b/src/widgets/autoreplace_widget.h
@@ -35,10 +35,8 @@ enum ReplaceVehicleWidgets {
 	WID_RV_STOP_REPLACE,             ///< Stop Replacing button.

 	/* Train only widgets. */
-	WID_RV_TRAIN_ENGINEWAGON_TOGGLE, ///< Button to toggle engines and/or wagons.
-	WID_RV_TRAIN_FLUFF_LEFT,         ///< The fluff on the left.
+	WID_RV_TRAIN_ENGINEWAGON_DROPDOWN, ///< Dropdown to select engines and/or wagons.
 	WID_RV_TRAIN_RAILTYPE_DROPDOWN,  ///< Dropdown menu about the railtype.
-	WID_RV_TRAIN_FLUFF_RIGHT,        ///< The fluff on the right.
 	WID_RV_TRAIN_WAGONREMOVE_TOGGLE, ///< Button to toggle removing wagons.
 };