Sergey Solovyev 5f800daa25 Merge branch 'dev-widget' into release-1.4 ... Conflicts: calculatorpp/AndroidManifest.xml		2012-10-20 16:27:08 +04:00
..
src	Calculator++ widget	2012-10-20 16:22:25 +04:00
pom.xml	Version changed	2012-10-20 16:26:34 +04:00