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
..
.gitignore	move several strings, including app name, NBS port, and url prefix, into generated	2015-08-03 04:55:59 -07:00
app_name.xml	up version and changelog for new release	2016-02-19 07:10:28 -08:00
common_rsrc.xml	remove FIXED -- was a one-time thing	2016-02-04 20:45:17 -08:00
strings.xml	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
styles.xml	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