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
..
drawable	Make backgrounds transparent. By me: the artist is not to blame. :-)	2010-07-09 23:02:19 -07:00
layout	Merge branch 'android_branch' into toolbar	2010-07-16 06:32:32 -07:00
menu	Merge branch 'android_branch' into toolbar	2010-07-16 06:32:32 -07:00
values	Merge branch 'android_branch' into toolbar	2010-07-16 06:32:32 -07:00
values-ca	remove unused string	2010-06-25 08:05:07 -07:00
values-cs	remove unused string	2010-06-25 08:05:07 -07:00
values-sk	remove unused string	2010-06-25 08:05:07 -07:00
xml	remove focus-color pref; add crosshairs-color pref in same place	2010-07-14 06:21:55 -07:00