Andy2 0c4191805f Merge branch 'android_branch' into android_invite ... Conflicts: xwords4/android/XWords4/res/values/common_rsrc.xml xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java xwords4/linux/scripts/discon_ok2.sh		2011-07-07 18:50:22 -07:00
..
scripts	add np (num players) param	2011-06-30 18:22:42 -07:00
XWords4	Merge branch 'android_branch' into android_invite	2011-07-07 18:50:22 -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