diff options
| author | Littleboy | 2011-05-02 17:18:22 -0400 |
|---|---|---|
| committer | Littleboy | 2011-05-02 17:21:10 -0400 |
| commit | 0e45aa8655dc3122e8d88dbcb67ab2013a292989 (patch) | |
| tree | f523e5c1870497528d85385ce5ef24259937813c /backends/platform/android/org | |
| parent | 580986aa42889c9a775b3ebe5709292d779f41cf (diff) | |
| parent | 1aff380a15f12e53bd380fc2a189882e2d6172c0 (diff) | |
| download | scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.gz scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.tar.bz2 scummvm-rg350-0e45aa8655dc3122e8d88dbcb67ab2013a292989.zip | |
Merge remote-tracking branch 'upstream/master' into nsis
Conflicts:
devtools/create_project/scripts/postbuild.cmd
devtools/create_project/visualstudio.cpp
ports.mk
Diffstat (limited to 'backends/platform/android/org')
| -rw-r--r-- | backends/platform/android/org/inodes/gus/scummvm/ScummVM.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java index 8bf40ac553..c4de6d62f8 100644 --- a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java +++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java @@ -35,7 +35,7 @@ public abstract class ScummVM implements SurfaceHolder.Callback, Runnable { private String[] _args; - final private native void create(AssetManager _asset_manager, + final private native void create(AssetManager asset_manager, EGL10 egl, EGLDisplay egl_display, AudioTrack audio_track, int sample_rate, int buffer_size); |