android-calculatorpp/android-app/res/layout
Sergey Solovyev b9dd6b0fef Merge branch 'dev-app-structure' into dev
Conflicts:
	android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
	android-app/AndroidManifest.xml
	android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorFragmentType.java
2012-12-01 21:30:47 +04:00
..
about_fragment.xml changes 2012-11-30 16:16:23 +04:00
ad.xml changes 2012-11-30 16:16:23 +04:00
admob_pref.xml changes 2012-11-30 16:16:23 +04:00
calc_plot_view.xml changes 2012-11-30 16:16:23 +04:00
calculator_messages_dialog_message.xml changes 2012-11-30 16:16:23 +04:00
calculator_messages_dialog.xml changes 2012-11-30 16:16:23 +04:00
cpp_app_button_copy.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_button_donate.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_button_erase.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_button_paste.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_display_mobile.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_display.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_editor_mobile.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_editor.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_keyboard_mobile.xml changes 2012-12-01 20:15:24 +04:00
cpp_app_keyboard.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_0.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_1.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_2.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_3.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_4.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_5.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_6.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_7.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_8.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_9.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_clear.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_division.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_dot.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_empty.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_equals.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_functions.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_history.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_left.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_multiplication.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_operators.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_plus.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_right.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_round_brackets.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_subtraction.xml changes 2012-12-01 20:15:24 +04:00
cpp_drag_button_vars.xml Merge branch 'dev-app-structure' into dev 2012-12-01 21:30:47 +04:00
display_error_message.xml changes 2012-11-30 16:16:23 +04:00
drag_button_calibration.xml changes 2012-11-30 16:16:23 +04:00
feedback.xml changes 2012-11-30 16:16:23 +04:00
function_add_param.xml changes 2012-11-30 16:16:23 +04:00
function_edit_param.xml changes 2012-11-30 16:16:23 +04:00
function_edit.xml changes 2012-11-30 16:16:23 +04:00
help_faq_fragment.xml changes 2012-11-30 16:16:23 +04:00
help_hints_fragment.xml changes 2012-11-30 16:16:23 +04:00
help_screens_fragment.xml changes 2012-11-30 16:16:23 +04:00
history_edit.xml changes 2012-11-30 16:16:23 +04:00
history_fragment.xml changes 2012-11-30 16:16:23 +04:00
history_item.xml changes 2012-11-30 16:16:23 +04:00
main_calculator_mobile.xml changes 2012-12-01 20:15:24 +04:00
main_calculator.xml changes 2012-12-01 20:15:24 +04:00
main_empty_multi_pane.xml changes 2012-11-30 16:16:23 +04:00
main_empty.xml changes 2012-11-30 16:16:23 +04:00
math_entities_fragment.xml changes 2012-11-30 16:16:23 +04:00
math_entity.xml changes 2012-11-30 16:16:23 +04:00
notespp_announce.xml changes 2012-11-30 16:16:23 +04:00
plot_fragment.xml changes 2012-11-30 16:16:23 +04:00
release_notes_fragment.xml changes 2012-11-30 16:16:23 +04:00
saved_history_item.xml changes 2012-11-30 16:16:23 +04:00
tabs.xml changes 2012-11-30 16:16:23 +04:00
var_edit.xml changes 2012-11-30 16:16:23 +04:00
vars_fragment.xml changes 2012-11-30 16:16:23 +04:00