Commit Graph

5 Commits

Author SHA1 Message Date
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
Sergey Solovyev
fa7904c1cd Changes 2012-11-18 17:33:05 +04:00
Sergey Solovyev
1a8feb86db Im and Re 2012-11-15 23:15:13 +04:00
serso
de52ca4512 Matrix support 2012-10-12 11:20:39 +04:00
Sergey Solovyev
d67728db8c Directory renamed 2012-03-05 22:48:02 +04:00