android-calculatorpp/android-app-core
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 changes 2012-12-01 20:15:24 +04:00
src/main/java/org/solovyev/android/calculator Merge branch 'dev-app-structure' into dev 2012-12-01 21:30:47 +04:00
AndroidManifest.xml changes 2012-11-30 18:07:20 +04:00
pom.xml changes 2012-12-01 20:15:24 +04:00