Eric House 8327fa71a1 Merge branch 'android_branch' into android_translate ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2016-01-29 06:03:58 -08:00
..
.idea	Recent AS metadata changes. I'm waiting for the changes to stop....	2016-01-20 07:58:41 -08:00
app	Recent AS metadata changes. I'm waiting for the changes to stop....	2016-01-20 07:58:41 -08:00
archive	show explanatory text when there are no invitations	2016-01-25 07:29:26 -08:00
assets	add changelog mention of weblate additions	2016-01-24 10:32:07 -08:00
gradle/wrapper	add exactly as came from modified sample app	2015-11-11 18:55:24 -08:00
img_src	add missing image	2015-08-24 07:42:36 -07:00
jni	Merge tag 'android_beta_100' into android_branch	2016-01-03 11:36:37 -08:00
libs	Cleanup: get rid of ListActivity. Eventually all Activities need to	2015-11-24 08:01:16 -08:00
res	cleanup from review of diff since last release. All whitespace or	2016-01-27 07:31:10 -08:00
res_src	Merge branch 'android_branch' into android_translate	2016-01-29 06:03:58 -08:00
src/org/eehouse/android/xw4	cleanup from review of diff since last release. All whitespace or	2016-01-27 07:31:10 -08:00
.gitignore	Cleanup: get rid of ListActivity. Eventually all Activities need to	2015-11-24 08:01:16 -08:00
AndroidManifest.xml	up app version strings, changes list for new release	2016-01-21 20:56:45 -08:00
build.gradle	add exactly as came from modified sample app	2015-11-11 18:55:24 -08:00
build.xml	send the correctly calculated hash value, and up strings for another	2016-01-03 20:23:46 -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
gradle.properties	add exactly as came from modified sample app	2015-11-11 18:55:24 -08:00
gradlew	add exactly as came from modified sample app	2015-11-11 18:55:24 -08:00
gradlew.bat	add exactly as came from modified sample app	2015-11-11 18:55:24 -08: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
settings.gradle	add exactly as came from modified sample app	2015-11-11 18:55:24 -08:00
XWords4.iml	some AS changes when run the first time. Source-level debugging of	2015-11-11 19:04:58 -08:00