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
..
2013-01-06 16:35:53 +04:00
2013-09-20 21:26:09 +04:00
2013-07-19 12:20:11 +04:00
2013-09-20 22:14:08 +04:00
2013-07-22 15:26:15 +04:00
2013-09-20 22:14:08 +04:00
2013-06-15 00:31:52 +04:00
2013-09-20 21:26:09 +04:00