Eric House b7694b67d2 Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. ... Conflicts: xwords4/android/XWords4/.gitignore xwords4/android/XWords4/archive/R.java xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/res/values/styles.xml xwords4/android/XWords4/res_src/values-ba_CK/strings.xml xwords4/android/XWords4/res_src/values-ca_PS/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/BTInviteDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java xwords4/android/XWords4/src/org/eehouse/android/xw4/Delegator.java xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayGameDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java xwords4/android/scripts/adb-install.sh xwords4/android/scripts/find-and-ant.sh		2016-03-11 22:19:37 -08:00
..
gradle/wrapper	files necessary for a gradle build (untested; need to commit and clone	2015-11-04 06:28:57 -08:00
scripts	merge remote changes	2016-03-08 07:27:30 -08:00
website	tweak name and reflect new name on website	2012-08-30 19:21:05 -07:00
XWords4	Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence.	2016-03-11 22:19:37 -08:00
XWords4-dbg	move dbg build back to target-19 too	2016-03-08 07:20:52 -08:00
.gitignore	ignore dirs for another branch (local only so far)	2014-09-08 07:06:45 -07:00
Application.mk	initial checkin of jni source and build scripts for android port	2010-01-02 19:10:08 +00:00
gradlew	files necessary for a gradle build (untested; need to commit and clone	2015-11-04 06:28:57 -08:00
INSTALL.txt	update build/install instructions	2015-03-03 07:12:44 -08:00