Merge branch 'master' into depature-boards

Conflicts: src/table/strgen_tables.h
2015-08-01 19:57:09 +01:00
parent 79138de1b9 67366cf03d
commit 526cb42608
133 changed files with 2582 additions and 1718 deletions
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -2907,6 +2907,10 @@
 				RelativePath=".\..\src\table\strgen_tables.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\string_colours.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\..\objs\langs\table\strings.h"
 				>