Merge 1.9.0-beta2

2019-02-14 00:47:22 +03:00
parent c2d889eab3 2bda8d4f34
commit 6e2a54355a
1364 changed files with 22213 additions and 10721 deletions
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.cpp 27816 2017-03-20 19:30:49Z peter1138 $ */
+/* $Id$ */

 /*
 * This file is part of OpenTTD.
@@ -41,6 +41,7 @@ static const KeycodeNames _keycode_to_name[] = {
 	{"GLOBAL", WKC_GLOBAL_HOTKEY},
 	{"ESC", WKC_ESC},
 	{"DEL", WKC_DELETE},
+	{"BACKSPACE", WKC_BACKSPACE},
 	{"RETURN", WKC_RETURN},
 	{"BACKQUOTE", WKC_BACKQUOTE},
 	{"F1", WKC_F1},