Eric House 9c9a04025a Merge branch 'android_branch' into android_thumbnail ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java		2013-11-04 06:20:53 -08:00
..
android	Merge branch 'android_branch' into android_thumbnail	2013-11-04 06:20:53 -08:00
common	Merge branch 'android_branch' into android_thumbnail	2013-11-04 06:20:53 -08:00
dawg	ignore dawg exporting files	2013-10-21 20:39:21 -07:00
debian	ignore debian build files	2012-01-04 18:11:29 -08:00
linux	Specify relative height of scoreboard and tray in board_figureLayout,	2013-11-04 06:19:33 -08:00
relay	use delete to free what's allocated using new	2013-10-25 06:16:17 -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	list java files first so their methods, which tend to be more	2013-07-11 19:56:37 -07:00