Andy2 a89d81587d Merge branch 'android_branch' into android_invite ... Conflicts: xwords4/android/XWords4/res/values/strings.xml		2011-05-14 11:54:31 -07:00
..
board_menu.xml	Add two new menus to be available only when in trade mode. Hide and	2011-03-10 18:13:56 -08:00
chat_menu.xml	add a clear-history menu to chat	2011-02-17 07:14:58 -08:00
dicts_item_menu.xml	replace two menuitems, default-robot and default-human, with a single	2011-05-14 11:04:19 -07:00
games_list_item_menu.xml	get rid of menuitem that was there only for development testing	2010-11-06 08:30:45 -07:00
games_list_menu.xml	add new activity for starting a new game. Has four buttons and	2011-05-06 06:52:10 -07:00
prefs_menu.xml	forgot to add this earlier and git didn't complain...	2010-06-16 18:07:01 -07:00