android-calculatorpp

Files

Sergey Solovyev 379f27db78 Merge branch 'master' into dev

Conflicts:
	android-app-core/res/values-de/text_vars.xml
	android-app-core/res/values-es/text_about.xml
	android-app-core/res/values-es/text_functions.xml
	android-app-core/res/values-es/text_operators.xml
	android-app-core/res/values-es/text_strings.xml
	android-app-core/res/values-es/text_vars.xml
	android-app-core/res/values-it/text_about.xml
	android-app-core/res/values-it/text_functions.xml
	android-app-core/res/values-it/text_operators.xml
	android-app-core/res/values-it/text_strings.xml
	android-app-core/res/values-it/text_vars.xml
	android-app-core/res/values-pl/text_about.xml
	android-app-core/res/values-pl/text_operators.xml
	android-app-core/res/values-pl/text_preferences.xml
	android-app-core/res/values-pl/text_strings.xml
	android-app-core/res/values-pl/text_vars.xml
	android-app-core/res/values-ru/text_about.xml
	android-app-core/res/values-uk/text_about.xml
	android-app-core/res/values-uk/text_functions.xml
	android-app-core/res/values-uk/text_operators.xml
	android-app-core/res/values-uk/text_preferences.xml
	android-app-core/res/values-uk/text_strings.xml
	android-app-core/res/values-uk/text_vars.xml
	android-app-core/res/values-zh-rtw/text_about.xml
	android-app-core/res/values-zh-rtw/text_functions.xml
	android-app-core/res/values-zh-rtw/text_operators.xml
	android-app-core/res/values-zh-rtw/text_preferences.xml
	android-app-core/res/values-zh-rtw/text_strings.xml
	android-app-core/res/values-zh-rtw/text_vars.xml
	android-app/project.properties
	pom.xml

2013-09-20 22:14:08 +04:00

arrays.xml

2013-06-26 12:22:26 +04:00

attributes.xml

2013-06-26 12:22:26 +04:00

colors.xml

2013-06-26 12:22:26 +04:00

dimens.xml

2013-06-26 12:22:26 +04:00

ids.xml

2013-06-26 12:22:26 +04:00

styles.xml

onscreen editor fixed

2013-07-03 01:27:50 +04:00

text_about.xml

translations

2013-09-20 22:01:40 +04:00

text_functions.xml

translations added

2013-07-16 17:13:37 +04:00

text_operators.xml

translations added

2013-07-16 17:13:37 +04:00

text_preferences.xml

translations

2013-09-20 22:01:40 +04:00

text_release_notes.xml

correct versions in release notes

2013-07-18 17:53:44 +04:00

text_strings.xml

translations

2013-09-20 22:01:40 +04:00

text_vars.xml

Merge branch 'master' into dev

2013-09-20 22:14:08 +04:00

text_wizard.xml

translations

2013-09-20 22:01:40 +04:00

theme_gray.xml

2013-06-26 12:22:26 +04:00

theme_light_blue.xml

2013-06-26 12:22:26 +04:00

theme_metro_blue.xml

2013-06-26 12:22:26 +04:00

theme_metro_green.xml

2013-06-26 12:22:26 +04:00

theme_metro_purple.xml

2013-06-26 12:22:26 +04:00

theme_violet.xml

2013-06-26 12:22:26 +04:00