Merge branch 'departure-boards' into departure-boards-sx

This commit is contained in:
Jonathan G Rennison
2015-11-01 11:18:10 +00:00
100 changed files with 6707 additions and 687 deletions

View File

@@ -310,6 +310,7 @@
<ClCompile Include="..\src\date.cpp" />
<ClCompile Include="..\src\debug.cpp" />
<ClCompile Include="..\src\dedicated.cpp" />
<ClCompile Include="..\src\departures.cpp" />
<ClCompile Include="..\src\depot.cpp" />
<ClCompile Include="..\src\disaster_vehicle.cpp" />
<ClCompile Include="..\src\driver.cpp" />
@@ -432,6 +433,9 @@
<ClInclude Include="..\src\date_type.h" />
<ClInclude Include="..\src\debug.h" />
<ClInclude Include="..\src\video\dedicated_v.h" />
<ClInclude Include="..\src\departures_func.h" />
<ClInclude Include="..\src\departures_gui.h" />
<ClInclude Include="..\src\departures_type.h" />
<ClInclude Include="..\src\depot_base.h" />
<ClInclude Include="..\src\depot_func.h" />
<ClInclude Include="..\src\depot_map.h" />
@@ -698,6 +702,7 @@
<ClCompile Include="..\src\company_gui.cpp" />
<ClCompile Include="..\src\console_gui.cpp" />
<ClCompile Include="..\src\date_gui.cpp" />
<ClCompile Include="..\src\departures_gui.cpp" />
<ClCompile Include="..\src\depot_gui.cpp" />
<ClCompile Include="..\src\dock_gui.cpp" />
<ClCompile Include="..\src\engine_gui.cpp" />
@@ -755,6 +760,7 @@
<ClInclude Include="..\src\widgets\company_widget.h" />
<ClInclude Include="..\src\widgets\console_widget.h" />
<ClInclude Include="..\src\widgets\date_widget.h" />
<ClInclude Include="..\src\widgets\departures_widget.h" />
<ClInclude Include="..\src\widgets\depot_widget.h" />
<ClInclude Include="..\src\widgets\dock_widget.h" />
<ClCompile Include="..\src\widgets\dropdown.cpp" />