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
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
common_rsrc.xml	Merge branch 'android_branch' into android_invite	2011-07-07 18:50:22 -07:00
strings.xml	Merge branch 'android_branch' into android_invite	2011-07-07 18:50:22 -07:00
styles.xml	add a bit of space around bullet items	2010-11-06 16:37:59 -07:00