Commit Graph

3 Commits

Author SHA1 Message Date
Sergey Solovyev
e7fe6a3c36 matrix button removed 2012-12-01 22:03:53 +04:00
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
Sergey Solovyev
79017b94f9 changes 2012-12-01 20:15:24 +04:00