Andy2 5ca9042b7e Merge branch 'android_branch' into french_xlation ... Conflicts: xwords4/android/XWords4/res/values/strings.xml		2011-09-01 20:01:47 -07:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
common_rsrc.xml	Merge branch 'french_xlation' of ssh://xwords.git.sf.net/gitroot/xwords/xwords into french_xlation	2011-08-31 19:16:02 -07:00
strings.xml	Merge branch 'android_branch' into french_xlation	2011-09-01 20:01:47 -07:00
styles.xml	add a bit of space around bullet items	2010-11-06 16:37:59 -07:00