Matthew Parlane 15f8603d1f Merge branch 'master' into wii-network ... Conflicts: Source/Core/Common/Src/CommonPaths.h Source/Core/Common/Src/FileUtil.cpp		2013-08-26 00:50:57 +00:00
..
.settings	[Android] Change the .settings file to target Java 1.6 instead of 1.5.	2013-08-22 07:39:11 -04:00
assets	[Android] Support clicking on games in the folder browser to add the folder currently in. Mostly for derps that keep trying to run the game from the folder browser.	2013-06-27 04:47:39 -05:00
jni
libs
res	Revert "[Android] First french translation. "	2013-08-24 09:50:02 -04:00
src/org/dolphinemu/dolphinemu	[Android] Invalidate the options menu upon switching fragments. This hides the 'clear game list' option faster when switching fragment. Also fixes a rare bug where the option might not even redraw when returning to the game list.	2013-08-24 09:19:40 -04:00
.classpath	[Android] Ensure that required dependencies are actually exported along with everything else when the Android version builds. Without this, the support libs will not export and cause the emulator to crash upon being executed.	2013-08-17 12:26:43 -04:00
.gitignore
.project
android.toolchain.cmake
AndroidManifest.xml	Fix android, part 3 of 3. >:)	2013-08-24 23:49:50 +12:00
build.xml
custom_rules.xml	[Android] Hopefully fix buildbot's ant build.	2013-08-20 15:41:11 -05:00
project.properties	[Android] Fix ant build?	2013-06-22 08:06:39 -05:00