Eric House 79293503fd Merge branch 'from_beta_60' into android_branch ... Conflicts: xwords4/android/XWords4/AndroidManifest.xml xwords4/android/XWords4/project.properties xwords4/android/XWords4/res/raw/changes		2013-06-25 21:25:03 -07:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
app_name.xml	Merge branch 'from_beta_60' into android_branch	2013-06-25 21:25:03 -07:00
common_rsrc.xml	new feature: long-click on wordlist button in BoardActivity brings up	2013-06-04 07:29:40 -07:00
strings.xml	bring up new popup on tap rather than long-tap of browser button to	2013-06-05 06:59:08 -07:00
styles.xml	make the two buttons fill the screen, and use newly created style	2012-11-20 19:11:39 -08:00