Eric House 4c1c0ddaaa Merge branch 'android_branch' into android_gcm ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java		2012-10-24 08:05:50 -07:00
..
assets	new versions of dicts with checksums and descriptions	2012-09-08 10:08:39 -07:00
jni	When a game's consumated and guest discovers it isn't using the same	2012-10-24 07:17:21 -07:00
res	Merge branch 'android_branch' into android_gcm	2012-10-24 08:05:50 -07:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into android_gcm	2012-10-24 08:05:50 -07:00
.gitignore	ignore new obj dir	2012-01-03 18:27:15 -08:00
AndroidManifest.xml	merge in SMS-version UI -- there will not be a separate version for	2012-10-15 08:29:46 -07:00
build.xml	add -pre-clean that invokes the jni's 'make clean'	2012-03-05 19:07:49 -08:00
build_unchecked.xml	version of build.xml modified to pass -xline to javac. For future use...	2010-11-05 05:06:04 -07:00
project.properties	back to building for android-7	2012-05-30 21:23:53 -07:00