![]() Conflicts: shell/android/jni/src/Android.cpp shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java shell/android/src/com/reicast/emulator/emu/JNIdc.java |
||
---|---|---|
.. | ||
src | ||
Android.mk | ||
Application.mk |
![]() Conflicts: shell/android/jni/src/Android.cpp shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java shell/android/src/com/reicast/emulator/emu/JNIdc.java |
||
---|---|---|
.. | ||
src | ||
Android.mk | ||
Application.mk |