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
..
android	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
common	add board_getSelPlayer()	2016-03-06 06:34:49 -08:00
dawg	Hack: use sed to strip utf-8 marker from start of file.	2016-01-04 20:38:49 -08:00
debian	ignore debian build files	2012-01-04 18:11:29 -08:00
linux	when a game's opened from an Android db, there's no row data to delete	2016-03-04 19:28:38 -08:00
relay	fix compiler warning	2016-01-21 06:25:19 -08:00
scripts	more work on script	2014-02-26 07:52:18 -08:00
tests	allow to run multiple games at once	2005-09-14 05:12:07 +00:00
wince	ignore dicts in main wince dir	2011-12-14 07:37:59 -08:00
Makefile	include all .xml and .java files, but only if they're not named in a .gitignore file in the same directory	2014-03-01 11:44:20 -08:00