diff options
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/java/src/com/android/godot/GodotLib.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/platform/android/java/src/com/android/godot/GodotLib.java b/platform/android/java/src/com/android/godot/GodotLib.java index e496d81356..459c6c1222 100644 --- a/platform/android/java/src/com/android/godot/GodotLib.java +++ b/platform/android/java/src/com/android/godot/GodotLib.java @@ -51,11 +51,7 @@ public class GodotLib { public static native void step(); public static native void touch(int what,int pointer,int howmany, int[] arr); public static native void accelerometer(float x, float y, float z); -<<<<<<< HEAD - public static native void key(int p_unicode_char, boolean p_pressed); -======= public static native void key(int p_scancode, int p_unicode_char, boolean p_pressed); ->>>>>>> 81757d2e977d959e6b0bc26f9fa990417ca91de9 public static native void focusin(); public static native void focusout(); public static native void audio(); |