Sergey Solovyev 9a7bb5dbc1 Merge branch 'dev' into dev-overlay-app ... Conflicts: calculatorpp-core/src/main/java/org/solovyev/android/calculator/Locator.java calculatorpp-core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java calculatorpp/src/main/java/org/solovyev/android/calculator/external/DefaultExternalCalculatorIntentHandler.java calculatorpp/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorHelper.java calculatorpp/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetHelper.java calculatorpp/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java		2012-11-21 12:03:48 +04:00
..
src	Merge branch 'dev' into dev-overlay-app	2012-11-21 12:03:48 +04:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2012-11-19 22:47:02 +04:00