summaryrefslogtreecommitdiffstats
path: root/core/os/keyboard.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-07-27 08:52:52 +0200
committerGitHub <noreply@github.com>2017-07-27 08:52:52 +0200
commit6645c7cc180274c9c9b23cbe6271ce5f04df20a9 (patch)
treeb79204d6eb00a83b753a222db4070bf0e61afb82 /core/os/keyboard.cpp
parent7c4a5f13920c2f4edb81160df3480b7b66e4ffd2 (diff)
parent7de7ca8ae4ef3720b68ba4178813afc33f96e05b (diff)
downloadredot-engine-6645c7cc180274c9c9b23cbe6271ce5f04df20a9.tar.gz
Merge pull request #9872 from bruvzg/3.0-num-enter-fix
Remove duplicate keycode constant for Numpad Enter key (3.0)
Diffstat (limited to 'core/os/keyboard.cpp')
-rw-r--r--core/os/keyboard.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp
index 2f5dc03614..e154b1934d 100644
--- a/core/os/keyboard.cpp
+++ b/core/os/keyboard.cpp
@@ -81,7 +81,6 @@ static const _KeyCodeText _keycodes[] = {
{KEY_F14 ,"F14"},
{KEY_F15 ,"F15"},
{KEY_F16 ,"F16"},
- {KEY_KP_ENTER ,"Kp Enter"},
{KEY_KP_MULTIPLY ,"Kp Multiply"},
{KEY_KP_DIVIDE ,"Kp Divide"},
{KEY_KP_SUBTRACT ,"Kp Subtract"},
@@ -334,7 +333,6 @@ bool keycode_has_unicode(uint32_t p_keycode) {
case KEY_F14:
case KEY_F15:
case KEY_F16:
- case KEY_KP_ENTER:
case KEY_SUPER_L:
case KEY_SUPER_R:
case KEY_MENU: