Themaister 034c553ff6 Merge branch 'master' into thread_video ... Conflicts: console/griffin/griffin.c		2013-02-17 13:25:41 +01:00
..
.settings	Delete original phoenix directory; Rename andretro directory to phoenix.	2012-12-06 01:47:52 -05:00
assets	(Android) delete accidentally-added overlays/shaders	2013-02-05 23:13:08 -05:00
jni	(Android) Include native/jni/Android.mk file in phoenix/jni/Android.mk	2012-12-27 14:55:40 +01:00
res	Merge branch 'master' into thread_video	2013-02-17 13:25:41 +01:00
src/org/retroarch/browser	Merge branch 'master' into thread_video	2013-02-17 13:25:41 +01: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	(Android) Fixes Madcatz fighting stick - now autodetected -	2013-02-13 22:52:27 +01: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