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
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
app_name.xml	Merge branch 'fix_tablets' into android_branch	2013-06-27 08:04:03 -07:00
common_rsrc.xml	Merge branch 'android_branch' into gtk_multigame	2013-07-09 07:18:00 -07:00
strings.xml	remove suggestion I don't have permission to use icons!	2013-07-07 19:53:12 -07:00
styles.xml	make the two buttons fill the screen, and use newly created style	2012-11-20 19:11:39 -08:00