Eric House 58bf3ba07b Merge remote-tracking branch 'maidu2/android_branch' into android_branch ... Conflicts: xwords4/android/XWords4/.gitignore xwords4/android/XWords4/build.gradle xwords4/android/scripts/common_targets.xml		2015-11-11 22:36:19 -08:00
..
android	Merge remote-tracking branch 'maidu2/android_branch' into android_branch	2015-11-11 22:36:19 -08:00
common	fix counting of messages sent by "Resend messages" menuitem: actually	2015-09-30 06:50:04 -07:00
dawg	Makefile to build new "zinga" wordlist, and config changes to include	2015-10-12 21:42:22 -07:00
debian	ignore debian build files	2012-01-04 18:11:29 -08:00
linux	fix counting of messages sent by "Resend messages" menuitem: actually	2015-09-30 06:50:04 -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