Eric House 4c1c0ddaaa Merge branch 'android_branch' into android_gcm ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java		2012-10-24 08:05:50 -07:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
app_name.xml	up version strings for pending new release	2012-09-17 06:36:58 -07:00
common_rsrc.xml	Merge branch 'android_branch' into android_gcm	2012-10-24 08:05:50 -07:00
strings.xml	When a game's consumated and guest discovers it isn't using the same	2012-10-24 07:17:21 -07:00
styles.xml	make buttons a bit wider since the bar scrolls now, and rearrange.	2011-11-04 17:14:37 -07:00