Andy2 dddec50f1d Merge branch 'android_branch' into android_browsedict ... Conflicts: xwords4/android/XWords4/jni/Android.mk xwords4/linux/Makefile xwords4/linux/linuxmain.c		2011-11-10 19:22:57 -08: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-11-04 17:23:27 -07:00
menu	replace burried launch-dict-browser menuitem with toolbar button and	2011-11-03 18:14:01 -07:00
raw	finish changelog	2011-11-07 06:51:27 -08:00
values	Merge branch 'android_branch' into android_browsedict	2011-11-04 17:23:27 -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