Merge branch 'master' into depature-boards

Conflicts:
	src/table/strgen_tables.h
This commit is contained in:
Jonathan G Rennison
2015-08-01 19:57:09 +01:00
133 changed files with 2582 additions and 1718 deletions

View File

@@ -446,7 +446,7 @@ enum WindowClass {
/**
* Generate landscape (newgame); %Window numbers:
* - GLWM_SCENARIO = #CreateScenarioWidgets
* - #GenenerateLandscapeWindowMode = #GenerateLandscapeWidgets
* - #GenerateLandscapeWindowMode = #GenerateLandscapeWidgets
*/
WC_GENERATE_LANDSCAPE,