Sergey Solovyev 40741566ec Merge branch 'dev-matrix-support' into dev ... Conflicts: calculatorpp/AndroidManifest.xml calculatorpp/project.properties calculatorpp/res/layout/calc_vars_button.xml calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java		2012-12-01 21:29:35 +04:00
..
misc	monkey script	2012-11-29 20:47:08 +04:00
res	Merge branch 'dev-matrix-support' into dev	2012-12-01 21:29:35 +04:00
src	Merge branch 'dev-matrix-support' into dev	2012-12-01 21:29:35 +04:00
AndroidManifest.xml	Merge branch 'dev-matrix-support' into dev	2012-12-01 21:29:35 +04:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2012-11-29 21:01:51 +04:00
proguard.cfg	Changes	2012-11-18 17:59:39 +04:00
project.properties	Fixes	2012-11-18 20:47:55 +04:00