android-calculatorpp/android-app-core
Sergey Solovyev 6977b4c6b8 Merge branch 'dev-number-format-in-editor' into dev
Conflicts:
	android-app-core/res/values-ru/text_strings.xml
	android-app-core/res/values-ru/text_wizard.xml
	android-app-core/res/values/text_strings.xml
	android-app-core/res/values/text_wizard.xml
2013-07-01 23:39:23 +04:00
..
res Merge branch 'dev-number-format-in-editor' into dev 2013-07-01 23:39:23 +04:00
src/main fixable message removed 2013-07-01 11:31:06 +04:00
AndroidManifest.xml copyright + code reformat 2013-06-26 12:22:26 +04:00
pom.xml copyright + code reformat 2013-06-26 12:22:26 +04:00