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
..
scripts	revert accidental part of commit	2013-07-08 07:14:42 -07:00
website	tweak name and reflect new name on website	2012-08-30 19:21:05 -07:00
XWords4	Merge branch 'android_branch' into gtk_multigame	2013-07-09 07:18:00 -07:00
XWords4-bt	get rid of NODE_CAN_4. Not change to post-compiled code	2012-08-01 20:29:15 -07:00
XWords4-dbg	add temp menu that gets a phone number and sends an NBS message to it,	2012-03-13 07:51:45 -07:00
XWords4-sms	starting new variant for GCM	2012-10-16 07:41:04 -07:00
.gitignore	ignore dir not on this branch	2012-10-16 08:20:53 -07:00
Application.mk	initial checkin of jni source and build scripts for android port	2010-01-02 19:10:08 +00:00
INSTALL.txt	update instructions for building	2011-11-19 20:05:04 -08:00