Andy2 0c4191805f Merge branch 'android_branch' into android_invite ... Conflicts: xwords4/android/XWords4/res/values/common_rsrc.xml xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java xwords4/linux/scripts/discon_ok2.sh		2011-07-07 18:50:22 -07:00
..
drawable	shrink needs-sync flag icon	2010-10-23 13:52:56 -07:00
layout	include default language in text in new game dialog.	2011-06-28 19:01:03 -07:00
menu	add icon for new add-game menuitem	2011-05-26 18:46:29 -07:00
raw	forgot a change	2011-07-07 06:27:28 -07:00
values	Merge branch 'android_branch' into android_invite	2011-07-07 18:50:22 -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	Merge branch 'android_branch' into android_invite	2011-07-07 18:50:22 -07:00