Eric House 1df48d2792 Merge branch 'android_branch' into relay_noconn ... Conflicts: xwords4/android/XWords4/archive/R.java xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/res_src/values-ba_CK/strings.xml xwords4/android/XWords4/res_src/values-ca_PS/strings.xml		2015-08-21 07:17:31 -07:00
..
.gitignore	move several strings, including app name, NBS port, and url prefix, into generated	2015-08-03 04:55:59 -07:00
app_name.xml	move several strings, including app name, NBS port, and url prefix, into generated	2015-08-01 22:39:00 -07:00
common_rsrc.xml	experimental option that puts invite url text into clipboard so user	2015-08-07 07:55:26 -07:00
strings.xml	Merge branch 'android_branch' into relay_noconn	2015-08-21 07:17:31 -07:00
styles.xml	make paired buttons height fill their container, forcing them to be	2015-03-12 21:06:31 -07:00