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

---
 platform/android/os_android.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'platform/android/os_android.cpp')

diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index 093064104..e625c0d7e 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -370,7 +370,7 @@ void OS_Android::main_loop_focusin(){
 
 }
 
-void OS_Android::process_joy_event(OS_Android::JoystickEvent p_event) {
+void OS_Android::process_joy_event(OS_Android::JoypadEvent p_event) {
 
 	switch (p_event.type) {
 	case JOY_EVENT_BUTTON:
-- 
cgit v1.2.3-70-g09d2