Merge branch 'master' into jgrpp

# Conflicts: # src/industry_gui.cpp # src/lang/korean.txt # src/town.h # src/town_gui.cpp
2020-01-08 18:40:34 +00:00
parent 6d326deafe 5a31efd98d
commit 4adfe0c9ae
73 changed files with 210 additions and 249 deletions
--- a/src/town.h
+++ b/src/town.h
@@ -203,7 +203,6 @@ enum TownRatingCheckType {
 /** Special values for town list window for the data parameter of #InvalidateWindowData. */
 enum TownDirectoryInvalidateWindowData {
 	TDIWD_FORCE_REBUILD,
-	TDIWD_FILTER_CHANGES,        ///< The filename filter has changed (via the editbox)
 	TDIWD_POPULATION_CHANGE,
 	TDIWD_FORCE_RESORT,
 };