Eric House 8a856721cd Merge branch 'android_branch' into french_xlation ... Conflicts: xwords4/android/XWords4/res/values/strings.xml		2011-09-07 22:02:04 -07:00
..
scripts	add options to be used comparing across branches	2011-08-29 05:46:31 -07:00
XWords4	Merge branch 'android_branch' into french_xlation	2011-09-07 22:02:04 -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	fix for new location. Need to get this out of git somehow.	2010-06-07 06:11:11 -07:00