Eric House d4515c4930 Merge remote-tracking branch 'sf/android_branch' into android_multi2 ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java		2015-02-23 08:02:56 -08:00
..
archive	alert on receiving phone when SMS sender is using older/incompatible protocol.	2015-02-18 06:49:43 -08:00
assets	add another change summary item	2015-02-23 07:11:43 -08:00
img_src	get rid of send-invitation menuitem, since it's never there unless	2015-01-24 16:32:11 -08:00
jni	add debug-only "tag" to open games so logging can more easily track	2015-02-09 19:15:43 -08: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 'android_branch' into android_multi2	2015-02-18 19:40:36 -08:00
res_src	alert on receiving phone when SMS sender is using older/incompatible protocol.	2015-02-18 06:49:43 -08:00
src/org/eehouse/android/xw4	manually bring in db71c4e4e2: force	2015-02-21 17:37:10 -08:00
.gitignore	adding file required for proguard	2014-07-14 21:46:09 -07:00
AndroidManifest.xml	Merge branch 'android_branch' into android_multi2	2015-02-18 19:40:36 -08:00
build.xml	up client version so we can tell when adoption's getting close to complete	2015-02-18 19:55:40 -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
proguard-project.txt	adding file required for proguard	2014-07-14 21:46:09 -07:00
project.properties	turn proguard back Off. Will get it working on another branch.	2014-07-14 22:37:10 -07:00