Merge remote-tracking branch 'upstream/master'

2021-01-25 00:50:42 +02:00
parent f1c4a114bd b2d9a2dc79
commit 3a82c97aa1
1076 changed files with 25433 additions and 61762 deletions
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -244,7 +244,7 @@ static void AddKey(NWidgetHorizontal *hor, int height, int num_half, WidgetType
 		hor->Add(leaf);
 	}

-	*biggest_index = max(*biggest_index, widnum);
+	*biggest_index = std::max(*biggest_index, widnum);
 }

 /** Construct the top row keys (cancel, ok, backspace). */