Andy2 650d9f5b45 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into toolbar ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java		2010-07-01 05:54:43 -07:00
..
xwprefs.xml	Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into toolbar	2010-07-01 05:54:43 -07:00