Merge branch 'infrastructure_sharing' into jgrpp

# Conflicts: # src/infrastructure.cpp # src/order_cmd.cpp
2017-02-22 20:58:39 +00:00
parent 091c30e254 f3b1059930
commit df3c10c523
10 changed files with 98 additions and 55 deletions
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1559,6 +1559,10 @@
 				RelativePath=".\..\src\order_base.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\order_cmd.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\order_func.h"
 				>