Andy2 a99e8142b0 Merge branch 'android_branch' into toolbar ... Conflicts: xwords4/android/XWords4/jni/Android.mk xwords4/android/XWords4/jni/xwjni.c xwords4/android/XWords4/res/values/strings.xml xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java		2010-07-16 06:32:32 -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	use delete button in XWListItem instead of context menu item for DictsActivity too.	2010-07-16 06:19:19 -07: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
prefs_menu.xml	forgot to add this earlier and git didn't complain...	2010-06-16 18:07:01 -07:00