Eric House 11aae82051 Merge branch 'android_branch' into android_translate ... Conflicts: xwords4/android/XWords4/archive/R.java xwords4/android/XWords4/res/values/strings.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/DlgDelegate.java		2015-08-23 21:54:18 -07:00
..
android	Merge branch 'android_branch' into android_translate	2015-08-23 21:54:18 -07:00
common	when no moves found, reset engine and try again. Works around bug	2015-08-19 07:43:00 -07:00
dawg	Makefile for new wordlist	2015-07-08 20:41:13 -07:00
debian	ignore debian build files	2012-01-04 18:11:29 -08:00
linux	fix curses app for standalone games (at least to not crash)	2015-08-19 06:05:18 -07:00
relay	manual bring-over of relay changes for invite support	2015-07-11 08:08:22 -07: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