Merge branch 'javaclass' of github.com:kivy/python-for-android into javaclass

tito · tito · commit 0b6a80ba5957 · 2012-08-11T23:42:59.000+02:00
Conflicts:
	recipes/android/src/jni.pxi
diff --git a/recipes/android/src/jni.pxi b/recipes/android/src/jni.pxi
@@ -41,8 +41,6 @@ cdef extern from "jni.h":
         const_char* signature
         void*       fnPtr
 
-    ctypedef const_JNINativeMethod "const JNINativeMethod"
-
     ctypedef union jvalue:
         jboolean    z
         jbyte       b
@@ -400,4 +398,3 @@ cdef extern from "jni.h":
         pass
 
 cdef extern JNIEnv *SDL_ANDROID_GetJNIEnv()
-
