summaryrefslogtreecommitdiff
path: root/platform/x11
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-02-03 11:18:43 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-02-03 11:18:43 +0100
commitfc65a57ff54d40727865ba117ed9f085bc7207fb (patch)
tree796b40532ab5117b10323c32d7d31ba66316e175 /platform/x11
parent84b2aa5a624e5c7506873d2edf27195cd929fa30 (diff)
parentf4fa74fe28bc57205461c1937fb6f7ad15886a84 (diff)
Merge pull request #3538 from Hinsbart/temp
remove pc_joystick_map.h
Diffstat (limited to 'platform/x11')
-rw-r--r--platform/x11/os_x11.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index f42e93b93f..7c4c625dbc 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -65,7 +65,6 @@
#include <X11/Xatom.h>
-//#include "os/pc_joystick_map.h"
#undef CursorShape