Eric House a25d664eb5 Merge branch 'from_android_beta_65' into android_branch ... Conflicts: xwords4/android/XWords4/res/raw/changes xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java		2013-09-09 08:01:28 -07:00
..
assets	add new flag bit to built-in wordlists	2013-04-20 19:46:52 -07:00
jni	Merge branch 'from_android_beta_65' into android_branch	2013-09-09 08:01:28 -07:00
libs	merge in changes from the -gcm directory: GCM will be a feature of the	2012-11-02 05:35:31 -07:00
res	Merge branch 'from_android_beta_65' into android_branch	2013-09-09 08:01:28 -07:00
src/org/eehouse/android/xw4	Merge branch 'from_android_beta_65' into android_branch	2013-09-09 08:01:28 -07:00
.gitignore	ignore new obj dir	2012-01-03 18:27:15 -08:00
AndroidManifest.xml	up version strings	2013-09-09 06:56:48 -07:00
build.xml	set DEBUG when building ndk based on target in build.xml	2013-08-29 07:28:08 -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
project.properties	change API version configured by build script to be what I'm using now	2013-07-08 07:03:57 -07:00