Andy2 b163b45abe Merge branch 'android_branch' into toolbar ... Conflicts: xwords4/android/XWords4/AndroidManifest.xml xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/res/xml/xwprefs.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConstants.java		2010-07-04 13:28:47 -07:00
..
drawable	add undo button; reorder menus; fix show-values menuitem	2010-06-29 18:26:37 -07:00
layout	add preference to hide title bar	2010-06-29 19:25:15 -07:00
menu	Merge branch 'android_branch' into toolbar	2010-07-04 13:28:47 -07:00
values	Merge branch 'android_branch' into toolbar	2010-07-04 13:28:47 -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	move colors editing prefs screen into appearance prefs screen	2010-07-04 12:53:45 -07:00