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
..
misc	changes	2012-11-30 16:16:23 +04:00
res	Merge branch 'dev-app-structure' into dev	2012-12-01 21:30:47 +04:00
src	Merge branch 'dev-app-structure' into dev	2012-12-01 21:30:47 +04:00
AndroidManifest.xml	Merge branch 'dev-app-structure' into dev	2012-12-01 21:30:47 +04:00
pom.xml	changes	2012-12-01 18:46:36 +04:00
proguard.cfg	changes	2012-11-30 16:16:23 +04:00
project.properties	changes	2012-12-01 20:39:29 +04:00