Andy2 a99e8142b0 Merge branch 'android_branch' into toolbar ... Conflicts: xwords4/android/XWords4/jni/Android.mk xwords4/android/XWords4/jni/xwjni.c xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java		2010-07-16 06:32:32 -07:00
..
android	Merge branch 'android_branch' into toolbar	2010-07-16 06:32:32 -07:00
common	Merge branch 'android_branch' into toolbar	2010-07-16 06:32:32 -07:00
dawg	ignore files in dawg/	2010-07-07 23:18:14 -07:00
linux	Merge branch 'android_branch' into toolbar	2010-07-16 06:32:32 -07:00
relay	log when dropping message that would mess up cref player counts	2010-07-16 06:23:20 -07:00
scripts	script to replace, eventually if I'm lucky, svnversion as a way to	2010-06-05 07:20:49 -07:00
tests	allow to run multiple games at once	2005-09-14 05:12:07 +00:00
wince	gitignores for wince	2010-06-20 22:58:59 -07:00
Makefile	include java files in TAGS	2010-01-25 02:09:08 +00:00