Andy2 a6a668881f Merge branch 'android_branch' into android_invite ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java		2011-06-05 10:49:17 -07:00
..
assets	new smallish English dictionary. See the Makefile for origins.	2011-04-29 06:24:25 -07:00
jni	track missing players -- players for whom space is reserved locally	2011-05-19 22:53:04 -07:00
res	add icon for new add-game menuitem	2011-05-26 18:46:29 -07:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into android_invite	2011-06-05 10:49:17 -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-05-16 06:44:04 -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