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/source.list
+++ b/source.list
@@ -312,6 +312,7 @@ object_type.h
 openttd.h
 order_backup.h
 order_base.h
+order_cmd.h
 order_func.h
 order_type.h
 pbs.h