Eric House c1e420f726 Merge branch 'android_branch' into send_in_background ... Conflicts: xwords4/relay/rq.c		2011-11-29 06:45:32 -08:00
..
drawable	adapt a couple of icons as placeholders for standalone and networked	2011-08-08 18:56:19 -07:00
layout	replace restore menus in prefs activity with buttons at bottom of	2011-11-22 19:00:03 -08:00
menu	replace restore menus in prefs activity with buttons at bottom of	2011-11-22 19:00:03 -08:00
raw	finish changelog	2011-11-07 06:51:27 -08:00
values	replace restore menus in prefs activity with buttons at bottom of	2011-11-22 19:00:03 -08: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	Merge branch 'android_branch' into send_in_background	2011-09-07 21:44:36 -07:00