dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'infrastructure_sharing' into jgrpp

Browse Source 
# Conflicts:
#	src/infrastructure.cpp
#	src/order_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2017-02-22 20:58:39 +00:00
parent 091c30e254 f3b1059930
commit df3c10c523
10 changed files with 98 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/openttd_vs100.vcxproj
View File

@@ -572,6 +572,7 @@
<ClInclude Include="..\src\openttd.h" />
<ClInclude Include="..\src\order_backup.h" />
<ClInclude Include="..\src\order_base.h" />
<ClInclude Include="..\src\order_cmd.h" />
<ClInclude Include="..\src\order_func.h" />
<ClInclude Include="..\src\order_type.h" />
<ClInclude Include="..\src\pbs.h" />

3
projects/openttd_vs100.vcxproj.filters
View File

@@ -948,6 +948,9 @@
<ClInclude Include="..\src\order_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\order_cmd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\order_func.h">
<Filter>Header Files</Filter>
</ClInclude>

1
projects/openttd_vs140.vcxproj
View File

@@ -589,6 +589,7 @@
<ClInclude Include="..\src\openttd.h" />
<ClInclude Include="..\src\order_backup.h" />
<ClInclude Include="..\src\order_base.h" />
<ClInclude Include="..\src\order_cmd.h" />
<ClInclude Include="..\src\order_func.h" />
<ClInclude Include="..\src\order_type.h" />
<ClInclude Include="..\src\pbs.h" />

3
projects/openttd_vs140.vcxproj.filters
View File

@@ -948,6 +948,9 @@
<ClInclude Include="..\src\order_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\order_cmd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\order_func.h">
<Filter>Header Files</Filter>
</ClInclude>

4
projects/openttd_vs80.vcproj
View File

@@ -1562,6 +1562,10 @@
RelativePath=".\..\src\order_base.h"
>
</File>
<File
RelativePath=".\..\src\order_cmd.h"
>
</File>
<File
RelativePath=".\..\src\order_func.h"
>

4
projects/openttd_vs90.vcproj
View File

@@ -1559,6 +1559,10 @@
RelativePath=".\..\src\order_base.h"
>
</File>
<File
RelativePath=".\..\src\order_cmd.h"
>
</File>
<File
RelativePath=".\..\src\order_func.h"
>