Ryan Houdek 3ddd24872b Merge branch 'GLES3' ...

Conflicts:
	Source/Android/.idea/workspace.xml

2013-06-12 03:29:18 -05:00

..

.idea

[Android] Back to enforcing ICS or above limitation. Tired of this nonsense.

2013-06-11 08:45:31 -05:00

.settings

Android mega commit of trash.

2013-03-19 21:53:09 -05:00

assets

Generally make the Android UI better.

2013-04-23 14:27:49 -05:00

jni

Update the ant files to build the APK from terminal

2013-04-18 23:26:00 -05:00

res

[Android] Start of *working* GLES3 support. Needs to be able to compile in Windows still.

2013-06-11 08:33:56 -05:00

src/org/dolphinemu/dolphinemu

[Android] Remove artificial limitation to not leave the sdcard directory in the folder browser as well.

2013-06-11 08:25:15 -05:00

.classpath

Android mega commit of trash.

2013-03-19 21:53:09 -05:00

.gitignore

Android mega commit of trash.

2013-03-19 21:53:09 -05:00

.project

Change Android project name to dolphin emulator

2013-04-24 09:00:14 -05:00

Android.iml

[Android] Add in the Android Studio project files so one can use Android Studio instead of ADT.

2013-05-18 04:04:07 -05:00

android.toolchain.cmake

Get latest android cmake to support NDK 8e

2013-04-13 15:09:05 -05:00

AndroidManifest.xml

[Android] 0.5 Release.

2013-06-12 03:11:59 -05:00

build.xml

Android mega commit of trash.

2013-03-19 21:53:09 -05:00

custom_rules.xml

Update the ant files to build the APK from terminal

2013-04-18 23:26:00 -05:00

project.properties

Generally make the Android UI better.

2013-04-23 14:27:49 -05:00