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

@@ -159,6 +159,9 @@
<ClCompile Include="..\src\dedicated.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\departures.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\depot.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -525,6 +528,15 @@
<ClInclude Include="..\src\video\dedicated_v.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\departures_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\departures_gui.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\departures_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\depot_base.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1323,6 +1335,9 @@
<ClCompile Include="..\src\date_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\departures_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
<ClCompile Include="..\src\depot_gui.cpp">
<Filter>GUI Source Code</Filter>
</ClCompile>
@@ -1494,6 +1509,9 @@
<ClInclude Include="..\src\widgets\date_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\src\widgets\departures_widget.h">
<Filter>Widgets</Filter>
</ClInclude>
<ClInclude Include="..\src\widgets\depot_widget.h">
<Filter>Widgets</Filter>
</ClInclude>