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
..
res/layout	Merge branch 'dev-app-structure' into dev	2012-12-01 21:30:47 +04:00
src/main/java/org/solovyev/android/calculator/matrix	Merge branch 'dev-app-structure' into dev	2012-12-01 21:30:47 +04:00