Themaister 7f21a9b2d2 Merge branch 'master' of github.com:Themaister/RetroArch into thread_video ...

Conflicts:
	android/native/jni/Android.mk
	console/griffin/griffin.c

2013-02-17 00:47:36 +01:00

..

jni

Merge branch 'master' of github.com:Themaister/RetroArch into thread_video

2013-02-17 00:47:36 +01:00

res/values

(Android) Remove unnecessary icons for native activity

2012-10-16 02:20:53 +02:00

.classpath

(Android) Split up project into native / phoenix - phoenix now doesn't

2012-10-14 05:18:53 +02:00

.project

(Android) Split up project into native / phoenix - phoenix now doesn't

2012-10-14 05:18:53 +02:00

AndroidManifest.xml

(Android) Try to reduce call stack by pointing everything in thread entry function

2012-11-03 21:03:14 +01:00