ToadKing f4f284665c Merge branch 'android-2.3' ...

Conflicts:
	android/phoenix/src/org/retroarch/browser/RetroArch.java
	android/phoenix/src/org/retroarch/browser/SettingsActivity.java

2013-01-30 01:31:18 -05:00

..

.settings

Delete original phoenix directory; Rename andretro directory to phoenix.

2012-12-06 01:47:52 -05:00

assets

(Android) Changed names somewhat + bumped up version

2013-01-26 23:23:54 +01:00

jni

(Android) Include native/jni/Android.mk file in phoenix/jni/Android.mk

2012-12-27 14:55:40 +01:00

res

(Android) add ability to report IME

2013-01-28 20:11:54 -05:00

src/org/retroarch/browser

Merge branch 'android-2.3'

2013-01-30 01:31:18 -05:00

.classpath

(Phoenix Legacy) Adding back phoenix legacy for now

2012-12-08 12:37:00 +01:00

.gitignore

Delete original phoenix directory; Rename andretro directory to phoenix.

2012-12-06 01:47:52 -05:00

.project

Start adding path settings.

2013-01-04 16:46:22 +01:00

AndroidManifest.xml

Merge branch 'android-2.3'

2013-01-30 01:31:18 -05:00

ant.properties

Delete original phoenix directory; Rename andretro directory to phoenix.

2012-12-06 01:47:52 -05:00

build.xml

Delete original phoenix directory; Rename andretro directory to phoenix.

2012-12-06 01:47:52 -05:00

proguard-project.txt

Delete original phoenix directory; Rename andretro directory to phoenix.

2012-12-06 01:47:52 -05:00

project.properties

Delete original phoenix directory; Rename andretro directory to phoenix.

2012-12-06 01:47:52 -05:00