Andy2 a99e8142b0 Merge branch 'android_branch' into toolbar ... Conflicts: xwords4/android/XWords4/jni/Android.mk xwords4/android/XWords4/jni/xwjni.c xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java		2010-07-16 06:32:32 -07:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
common_rsrc.xml	remove focus-color pref; add crosshairs-color pref in same place	2010-07-14 06:21:55 -07:00
strings.xml	Merge branch 'android_branch' into toolbar	2010-07-16 06:32:32 -07:00
styles.xml	add layout_weight so buttons expand to fill toolbar. I really want	2010-07-05 09:47:26 -07:00