diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-01-07 00:47:39 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2016-01-07 00:47:39 +0100 |
| commit | e668fd7a02ade8c50b6adf37520d596af9c94e98 (patch) | |
| tree | ac025cbe2680f6abe80ce3e3283978cbdd132242 /Source/Core/InputCommon/ControllerInterface/Android | |
| parent | 7c91dbe239999ed9771d2449eeed472a4a463559 (diff) | |
| parent | 74478addebe33521587f99deaf68d93a3dcc5252 (diff) | |
Merge pull request #3465 from Sonicadvance1/Android_move_jni
Move Android JNI bits from DolphinWX to the Android folder.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Android')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Android/Android.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h index 35b68cdd71..c108a86067 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h @@ -4,8 +4,8 @@ #pragma once -#include "DolphinWX/Android/ButtonManager.h" #include "InputCommon/ControllerInterface/Device.h" +#include "jni/ButtonManager.h" namespace ciface { |