Eric House 8ddc9a7770 Merge branch 'android_branch' into android_thumbnail ... Conflicts: xwords4/android/XWords4/res/values/strings.xml		2013-10-30 21:46:45 -07:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
app_name.xml	up version strings and start changelist	2013-10-24 07:30:39 -07:00
common_rsrc.xml	turn thumbnails on by default	2013-10-29 21:00:50 -07:00
strings.xml	Merge branch 'android_branch' into android_thumbnail	2013-10-30 21:46:45 -07:00
styles.xml	make the two buttons fill the screen, and use newly created style	2012-11-20 19:11:39 -08:00