Andy2 b163b45abe Merge branch 'android_branch' into toolbar ... Conflicts: xwords4/android/XWords4/AndroidManifest.xml xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/res/xml/xwprefs.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConstants.java		2010-07-04 13:28:47 -07:00
..
board_menu.xml	add undo button; reorder menus; fix show-values menuitem	2010-06-29 18:26:37 -07:00
dicts_item_menu.xml	Create new prefs screen with per-game defaults, adding existing and	2010-05-18 02:27:14 +00:00
games_list_item_menu.xml	add "play game" item to context menu, and invoke that menu on item	2010-07-02 07:04:37 -07:00
games_list_menu.xml	Preferences->Settings; remove duplicated strings.	2010-05-27 02:56:54 +00:00
players_list_item_menu.xml	minor changes: rearrange menus, new strings, etc.	2010-02-14 22:05:08 +00:00
prefs_menu.xml	forgot to add this earlier and git didn't complain...	2010-06-16 18:07:01 -07:00