Andy2 b7691d2997 Merge branch 'android_branch' into two_phase_lookup ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java		2011-09-22 06:53:45 -07:00
..
assets	new smallish English dictionary. See the Makefile for origins.	2011-04-29 06:24:25 -07:00
jni	fix to work with changed C api	2011-09-22 06:49:34 -07:00
res	make word lookup two-stage, first a dialog to pick the word then	2011-09-21 19:04:33 -07:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into two_phase_lookup	2011-09-22 06:53:45 -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	remove unused string ref	2011-09-15 18:05:45 -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