Eric House d50c808f96 Merge branch 'android_branch' into gtk_multigame ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java xwords4/common/comms.c xwords4/linux/cursesmain.c xwords4/linux/cursesmain.h xwords4/linux/gtkmain.c xwords4/linux/gtkmain.h xwords4/linux/linuxmain.c xwords4/linux/main.h xwords4/linux/scripts/discon_ok2.sh xwords4/relay/xwrelay.cpp (Note: The curses app crashes on exit with mempool assertions, but that's a problem before the merge.)		2013-07-09 07:18:00 -07:00
..
drawable	remove no-longer-needed drawable	2012-10-01 17:52:56 -07:00
layout	set focusableInTouchMode on wordlist browser's layout. This is the	2013-06-05 07:34:31 -07:00
layout-small	add board layout for small case that doesn't include toolbar or	2012-06-19 06:11:16 -07:00
menu	add move-up and move-down menuitems so group order can be controlled	2012-12-26 18:55:15 -08:00
menu-small	add dict-browse menuitem to small-screen board menu and on same move	2012-06-19 06:19:03 -07:00
raw	list another change	2013-07-07 13:07:12 -07:00
values	Merge branch 'android_branch' into gtk_multigame	2013-07-09 07:18:00 -07:00
values-ca	remove strings no longer used	2012-08-31 21:34:25 -07:00
values-cs	remove unused strings	2012-11-01 19:45:13 -07:00
values-large	add toolbar button style for 'large' devices so buttons are bigger on	2012-07-02 07:39:06 -07:00
values-pt	more changes from translator	2013-07-05 21:37:38 -07:00
values-sk	remove unused strings	2012-11-01 19:45:13 -07:00
xml	clean up a couple of debug-only strings	2013-05-09 22:15:38 -07:00