Eric House 1f4f6a06a8 Merge branch 'android_branch' into android_bt ... Conflicts: xwords4/android/XWords4/jni/xwjni.c		2012-02-15 18:18:26 -08:00
..
drawable	icons stolen from ubuntu as placeholders for BT-working and -not.	2012-02-01 18:49:42 -08:00
layout	add preliminary text including number missing.	2012-02-10 18:44:27 -08:00
menu	add temporary ping menuitem, and implement by sending message to first	2012-01-19 06:42:08 -08:00
raw	another change for b42	2012-02-06 19:26:56 -08:00
values	Merge branch 'android_branch' into android_bt	2012-02-15 18:18:26 -08:00
values-ca	up copyright for the new year	2012-01-03 06:20:23 -08:00
values-cs	up copyright for the new year	2012-01-03 06:20:23 -08:00
values-sk	up copyright for the new year	2012-01-03 06:20:23 -08:00
xml	get 'svn' out of the version string variable	2011-12-21 18:35:14 -08:00