xwords/xwords4/android/XWords4
Eric House 7d8cddb31f Merge branch 'android_branch' into gtk_multigame
Conflicts:
	xwords4/linux/gtkmain.c
	xwords4/linux/linuxmain.c
	xwords4/relay/xwrelay.cpp
2013-05-08 07:37:55 -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-05-08 07:37:55 -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-05-08 07:37:55 -07:00
src/org/eehouse/android/xw4 Merge branch 'android_branch' into gtk_multigame 2013-05-08 07:37:55 -07:00
.gitignore ignore new obj dir 2012-01-03 18:27:15 -08:00
AndroidManifest.xml up version/changes for next release 2013-04-16 07:14:03 -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 use preferred SDK-8 API to look for downloads directory, and wrap it 2012-12-05 07:32:11 -08:00