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
..
text_about.xml	Merge branch 'master' into dev	2013-09-20 22:14:08 +04:00
text_functions.xml	translations	2013-09-20 22:01:40 +04:00
text_operators.xml	translations	2013-09-20 22:01:40 +04:00
text_preferences.xml	translations	2013-09-20 22:01:40 +04:00
text_release_notes.xml	release notes	2013-07-18 18:09:48 +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