Andy2 8b130521fa Merge branch 'android_branch' into android_invite ... Conflicts: xwords4/android/XWords4/res/values/strings.xml		2011-05-10 18:55:13 -07:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
common_rsrc.xml	replace placeholder language names with empty strings so, maybe, can	2011-05-10 18:36:48 -07:00
strings.xml	Merge branch 'android_branch' into android_invite	2011-05-10 18:55:13 -07:00
styles.xml	add a bit of space around bullet items	2010-11-06 16:37:59 -07:00