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
..
assets	add new flag bit to built-in wordlists	2013-04-20 19:46:52 -07:00
jni	Merge branch 'android_branch' into gtk_multigame	2013-07-09 07:18:00 -07:00
libs	merge in changes from the -gcm directory: GCM will be a feature of the	2012-11-02 05:35:31 -07:00
res	Merge branch 'android_branch' into gtk_multigame	2013-07-09 07:18:00 -07:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into gtk_multigame	2013-07-09 07:18:00 -07:00
.gitignore	ignore new obj dir	2012-01-03 18:27:15 -08:00
AndroidManifest.xml	add comment	2013-07-08 07:13:04 -07:00
build.xml	make it possible to build without knowing the GCM sender ID.	2012-11-22 08:13:06 -08:00
build_unchecked.xml	version of build.xml modified to pass -xline to javac. For future use...	2010-11-05 05:06:04 -07:00
project.properties	change API version configured by build script to be what I'm using now	2013-07-08 07:03:57 -07:00