Andy2 6b8fd222ef Merge branch 'android_branch' into french_xlation ... Conflicts: xwords4/android/XWords4/res/values/strings.xml		2011-08-21 14:35:53 -07:00
..
drawable	adapt a couple of icons as placeholders for standalone and networked	2011-08-08 18:56:19 -07:00
layout	add the standalone/network icons from GamesList display to the new	2011-08-21 14:30:00 -07:00
menu	comment: reminder of possible icon for archiving	2011-08-08 18:53:58 -07:00
raw	version string and changelog for beta 33	2011-08-21 12:07:45 -07:00
values	Merge branch 'android_branch' into french_xlation	2011-08-21 14:35:53 -07:00
values-ca	we need *name and *namef forms	2011-05-19 22:50:39 -07:00
values-cs	we need *name and *namef forms	2011-05-19 22:50:39 -07:00
values-sk	we need *name and *namef forms	2011-05-19 22:50:39 -07:00
xml	add pref for choosing what goes in parens along with the game name	2011-08-09 19:26:59 -07:00