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/source.list
+++ b/source.list
@@ -669,6 +669,7 @@ table/roadveh_movement.h
 table/sprites.h
 table/station_land.h
 table/strgen_tables.h
+table/string_colours.h
 ../objs/langs/table/strings.h
 table/town_land.h
 table/townname.h