Andy2 7d1e9c7638 Merge branch 'android_branch' into android_browsedict ... Conflicts: xwords4/android/XWords4/jni/Android.mk xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java		2011-10-28 22:27:22 -07:00
..
drawable	adapt a couple of icons as placeholders for standalone and networked	2011-08-08 18:56:19 -07:00
layout	Merge branch 'android_branch' into android_browsedict	2011-10-28 22:27:22 -07:00
menu	remove option to list all words played in a single lookup dialog, and	2011-10-14 22:32:30 -07:00
raw	add changelist change	2011-10-18 06:35:26 -07:00
values	Merge branch 'android_branch' into android_browsedict	2011-10-28 22:27:22 -07:00
values-ca	remove dead strings. Move app-name to common_rsrc.xml since it's not	2011-09-15 18:08:00 -07:00
values-cs	remove dead strings. Move app-name to common_rsrc.xml since it's not	2011-09-15 18:08:00 -07:00
values-sk	remove dead strings. Move app-name to common_rsrc.xml since it's not	2011-09-15 18:08:00 -07:00
xml	use autocaps for default player names pref	2011-09-03 21:54:25 -07:00