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
..
matrix_edit_fragment_item.xml	Matrix support	2012-10-12 11:20:39 +04:00
matrix_edit_fragment.xml	Matrix support	2012-10-12 17:41:13 +04:00