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
..
scripts	Merge branch 'android_branch' into relay_noconn	2015-08-10 07:37:03 -07:00
website	tweak name and reflect new name on website	2012-08-30 19:21:05 -07:00
XWords4	Merge branch 'android_branch' into relay_noconn	2015-08-21 07:17:31 -07:00
XWords4-dbg	Merge branch 'android_branch' into relay_noconn	2015-08-21 07:17:31 -07:00
.gitignore	ignore dirs for another branch (local only so far)	2014-09-08 07:06:45 -07:00
Application.mk	initial checkin of jni source and build scripts for android port	2010-01-02 19:10:08 +00:00
INSTALL.txt	update build/install instructions	2015-03-03 07:14:03 -08:00