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

android-app

Merge branch 'master' into dev

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

android-app-core

Merge branch 'master' into dev

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

android-app-onscreen

[maven-release-plugin] prepare for next development iteration

2013-07-22 15:04:30 +04:00

android-app-test

[maven-release-plugin] prepare for next development iteration

2013-07-22 15:04:30 +04:00

android-app-widget

[maven-release-plugin] prepare for next development iteration

2013-07-22 15:04:30 +04:00

core

[maven-release-plugin] prepare for next development iteration

2013-07-22 15:04:30 +04:00

crowdin.sh

translations

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

pom.xml

deps version update

2013-09-20 21:26:09 +04:00

Description

Android Calculator

24 MiB

Languages

Java 99.4%

Shell 0.3%

HTML 0.2%