Eric House 79293503fd Merge branch 'from_beta_60' into android_branch ... Conflicts: xwords4/android/XWords4/AndroidManifest.xml xwords4/android/XWords4/project.properties xwords4/android/XWords4/res/raw/changes		2013-06-25 21:25:03 -07:00
..
android	Merge branch 'from_beta_60' into android_branch	2013-06-25 21:25:03 -07:00
common	add new param so pending text can be drawn differently when it's not	2013-05-30 07:17:13 -07:00
dawg	add DICTNOTE	2013-05-21 06:58:53 -07:00
debian	ignore debian build files	2012-01-04 18:11:29 -08:00
linux	quick hack to allow testing intermix of chat with normal moves	2013-06-24 18:37:49 -07:00
relay	fix names to make units clear -- no code change	2013-06-10 06:38:42 -07:00
scripts	remove echoing	2011-09-14 05:45:32 -07: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 java files in TAGS	2010-01-25 02:09:08 +00:00