Eric House 86d8a46da2 Merge branch 'android_branch' into android_multi2 ... Conflicts: xwords4/common/comms.c		2015-02-18 19:40:36 -08:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
app_name.xml	up strings for new release	2015-02-18 19:24:17 -08:00
common_rsrc.xml	add preference controlling whether radio-free short-circuiting is used	2015-02-17 20:16:44 -08:00
strings.xml	alert on receiving phone when SMS sender is using older/incompatible protocol.	2015-02-18 06:49:43 -08:00
styles.xml	use a style for new game buttons	2014-11-20 19:12:56 -08:00