Eric House 265ac48b88 Merge branch 'android_branch' into relay_noconn ... Conflicts: xwords4/android/XWords4-dbg/AndroidManifest.xml xwords4/android/XWords4-dbg/res/layout/.gitignore xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore		2015-08-10 07:37:03 -07:00
..
android	Merge branch 'android_branch' into relay_noconn	2015-08-10 07:37:03 -07:00
common	bring over saved file format change from relay_conn branch so builds	2015-08-10 06:24:40 -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	show a toast when hint can't find anything, on the principle that user	2015-07-26 12:09:15 -07:00
relay	Merge branch 'android_branch' into relay_noconn	2015-07-11 08:27:24 -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