Eric House c4e638bd84 Merge branch 'android_branch' into android_groups ... Conflicts: xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java		2012-12-01 10:52:42 -08:00
..
assets	new versions of dicts with checksums and descriptions	2012-09-08 10:08:39 -07:00
jni	Fix occasional infinite loop of devices sending and receiving the same	2012-11-13 21:25:03 -08: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 android_groups	2012-12-01 10:52:42 -08:00
src/org/eehouse/android/xw4	Merge branch 'android_branch' into android_groups	2012-12-01 10:52:42 -08:00
.gitignore	ignore new obj dir	2012-01-03 18:27:15 -08:00
AndroidManifest.xml	disable attachments as part of invitations -- for now.	2012-11-30 07:50:10 -08: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	back to building for android-7	2012-05-30 21:23:53 -07:00