Eric House 598ee7599b Merge branch 'android_branch' into android_translate ... Conflicts: xwords4/android/XWords4/res/values/strings.xml		2015-08-20 07:43:16 -07:00
..
archive	changes left out of previous merge commit for some reason	2015-08-13 07:24:49 -07:00
assets	wrap email in changes log in a mailto url	2015-06-15 07:49:59 -07:00
img_src	get rid of send-invitation menuitem, since it's never there unless	2015-01-24 16:32:11 -08:00
jni	return count of messages sent from comms_resendAll(), and post it as a	2015-08-13 07:05:06 -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 'android_branch' into android_translate	2015-08-20 07:43:16 -07:00
res_src	Merge branch 'android_branch' into android_translate	2015-08-17 07:05:58 -07:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into android_translate	2015-08-20 07:43:16 -07:00
.gitignore	adding file required for proguard	2014-07-14 21:46:09 -07:00
AndroidManifest.xml	Merge branch 'for_android_beta_96' into android_branch (and up version strings)	2015-04-07 21:08:00 -07:00
build.xml	up client version. There are no protocol-related changes to require	2015-06-06 11:53:43 -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
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