From 547a57777b199f451305a6d4b6ad63fb0b2bd3ed Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sun, 8 Jan 2017 17:05:51 -0300
Subject: renamed joystick to joypad everywhere around source code!

---
 scene/gui/base_button.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scene/gui/base_button.cpp')

diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 1f5296e9d2..49cd7758df 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -156,7 +156,7 @@ void BaseButton::_gui_input(InputEvent p_event) {
 			}
 		} break;
 		case InputEvent::ACTION:
-		case InputEvent::JOYSTICK_BUTTON:
+		case InputEvent::JOYPAD_BUTTON:
 		case InputEvent::KEY: {
 
 
-- 
cgit v1.2.3