Eric House 31c443e4b1 Merge branch 'android_branch' into gtk_multigame ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/GCMIntentService.java xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java		2013-05-22 07:01:08 -07:00
..
android	Merge branch 'android_branch' into gtk_multigame	2013-05-22 07:01:08 -07:00
common	Merge branch 'android_branch' into gtk_multigame	2013-05-22 07:01:08 -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	toward having commandline params show up as defaults in new game dialog	2013-05-10 07:19:32 -07:00
relay	Merge branch 'android_branch' into gtk_multigame	2013-05-22 07:01:08 -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