Andy2 0c4191805f Merge branch 'android_branch' into android_invite ... Conflicts: xwords4/android/XWords4/res/values/common_rsrc.xml xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java xwords4/linux/scripts/discon_ok2.sh		2011-07-07 18:50:22 -07:00
..
assets	new smallish English dictionary. See the Makefile for origins.	2011-04-29 06:24:25 -07:00
jni	add timestamps to jni logs	2011-07-06 18:15:34 -07:00
res	Merge branch 'android_branch' into android_invite	2011-07-07 18:50:22 -07:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into android_invite	2011-07-07 18:50:22 -07:00
.gitignore	remove local.properties, and add a script, run from build.xml before	2010-06-20 09:29:13 -07:00
AndroidManifest.xml	Merge branch 'android_branch' into android_invite	2011-07-07 18:50:22 -07:00
build.xml	remove local.properties, and add a script, run from build.xml before	2010-06-20 09:29:13 -07: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
default.properties	Build for 1.6 instead of 1.5 for SMS APIs	2010-02-09 14:16:23 +00:00