Eric House 88ad6d81ef Merge branch 'android_branch' into android_bt ... Conflicts: xwords4/android/XWords4/jni/xportwrapper.c xwords4/android/XWords4/jni/xwjni.c		2012-02-13 22:38:17 -08:00
..
assets	new smallish English dictionary. See the Makefile for origins.	2011-04-29 06:24:25 -07:00
jni	Merge branch 'android_branch' into android_bt	2012-02-13 22:38:17 -08:00
res	add preliminary text including number missing.	2012-02-10 18:44:27 -08:00
src/org/eehouse/android/xw4	add game name as something passed with invitation. Later will get it	2012-02-10 18:48:46 -08:00
.gitignore	ignore new obj dir	2012-01-03 18:27:15 -08:00
AndroidManifest.xml	move BT device listing into its own Activity. Call it from	2012-02-09 05:21:23 -08:00
build.xml	launch NDK build from inside build.xml.	2012-02-13 22:15:12 -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	update build scripts to use newer NDK.	2012-01-02 18:11:36 -08:00