xwords/xwords4/android/XWords4/res/xml
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
..
xwprefs.xml Merge branch 'android_branch' into android_invite 2011-07-07 18:50:22 -07:00