Merge branch 'vehicle_details_gui_additions' into jgrpp

Conflicts:
	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2015-08-30 17:10:19 +01:00
5 changed files with 80 additions and 6 deletions

View File

@@ -1588,6 +1588,8 @@ static SettingsContainer &GetSettingsTree()
interface->Add(new SettingEntry("gui.timetable_in_ticks"));
interface->Add(new SettingEntry("gui.timetable_arrival_departure"));
interface->Add(new SettingEntry("gui.expenses_layout"));
interface->Add(new SettingEntry("gui.show_train_length_in_details"));
interface->Add(new SettingEntry("gui.show_vehicle_group_in_details"));
}
SettingsPage *advisors = main->Add(new SettingsPage(STR_CONFIG_SETTING_ADVISORS));