Andy2 cdf526c95d Merge branch 'android_branch' into french_xlation ... Conflicts: xwords4/android/XWords4/res/values/strings.xml		2011-08-31 06:46:02 -07:00
..
drawable	adapt a couple of icons as placeholders for standalone and networked	2011-08-08 18:56:19 -07:00
layout	implement new util_ methods in jni and java; remove old miniwindow	2011-08-31 06:37:33 -07:00
menu	implement new util_ methods in jni and java; remove old miniwindow	2011-08-31 06:37:33 -07:00
raw	add two recent changes	2011-08-25 18:26:49 -07:00
values	Merge branch 'android_branch' into french_xlation	2011-08-31 06:46:02 -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 to edit color used to draw bonus hints on cells	2011-08-25 18:13:42 -07:00