aboutsummaryrefslogtreecommitdiff
path: root/platform/x11/os_x11.h
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-08 17:05:51 -0300
committerJuan Linietsky2017-01-08 17:06:33 -0300
commit547a57777b199f451305a6d4b6ad63fb0b2bd3ed (patch)
tree9fb9ce5851ea3ccc39c6ebce607ceeca771fd991 /platform/x11/os_x11.h
parent6323779596dea0db7f58afef7d3d3d5588ef20cb (diff)
downloadgodot-547a577.tar.gz
godot-547a577.tar.zst
godot-547a577.zip
renamed joystick to joypad everywhere around source code!
Diffstat (limited to 'platform/x11/os_x11.h')
-rw-r--r--platform/x11/os_x11.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index b89921fb3..4f9ff7129 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -155,7 +155,7 @@ class OS_X11 : public OS_Unix {
InputDefault *input;
#ifdef JOYDEV_ENABLED
- joystick_linux *joystick;
+ joypad_linux *joypad;
#endif
#ifdef RTAUDIO_ENABLED