Sergey Solovyev cd41a35093 Merge branch 'dev' into dev-overlay-app ... Conflicts: calculatorpp/AndroidManifest.xml calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java		2012-11-24 14:35:06 +04:00
..
misc	Rename	2012-11-24 13:56:09 +04:00
res	Calculator Onscreen	2012-11-23 18:19:31 +04:00
src	Merge branch 'dev' into dev-overlay-app	2012-11-24 14:35:06 +04:00
AndroidManifest.xml	Merge branch 'dev' into dev-overlay-app	2012-11-24 14:35:06 +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