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

..

misc

Resources

2012-10-23 11:44:54 +04:00

res

Calculator overlay added

2012-11-21 00:23:54 +04:00

src

Merge branch 'dev' into dev-overlay-app

2012-11-21 12:03:48 +04:00

AndroidManifest.xml

Calculator overlay added

2012-11-21 00:23:54 +04:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2012-11-19 22:47:02 +04:00

proguard.cfg

Changes

2012-11-18 17:59:39 +04:00

project.properties

Fixes

2012-11-18 20:47:55 +04:00