diff options
| author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
| commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
| tree | f2b06be630676b7302a1fb62940099b2ec71442d /backends/platform/android/jni.h | |
| parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
| parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
| download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'backends/platform/android/jni.h')
| -rw-r--r-- | backends/platform/android/jni.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/backends/platform/android/jni.h b/backends/platform/android/jni.h index 1abecf0a37..52698e0f35 100644 --- a/backends/platform/android/jni.h +++ b/backends/platform/android/jni.h @@ -145,4 +145,3 @@ inline int JNI::writeAudio(JNIEnv *env, jbyteArray &data, int offset, int size) #endif #endif - |