Eric House bb80cdfb08 Merge branch 'android_branch' into android_thumbnail ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java		2013-11-07 05:25:51 -08:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
app_name.xml	update strings for this x86-only release	2013-11-03 13:04:22 -08:00
common_rsrc.xml	Merge branch 'android_branch' into android_thumbnail	2013-11-07 05:25:51 -08:00
strings.xml	Merge branch 'android_branch' into android_thumbnail	2013-10-30 21:46:45 -07:00
styles.xml	make the two buttons fill the screen, and use newly created style	2012-11-20 19:11:39 -08:00