Eric House ac435b7857 Merge branch 'android_branch' into android_groups ... Conflicts: xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java		2012-11-25 14:11:04 -08:00
..
.gitignore	gitignore additions	2010-06-05 07:50:09 -07:00
app_name.xml	up strings for next release (still a while out!)	2012-11-20 04:14:25 -08:00
common_rsrc.xml	Revert "add read-only debug prefs giving GCM and relay device IDs."	2012-11-25 13:55:02 -08:00
strings.xml	Merge branch 'android_branch' into android_groups	2012-11-25 14:11:04 -08:00
styles.xml	make the two buttons fill the screen, and use newly created style	2012-11-20 19:11:39 -08:00