TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
379f27db78
android-calculatorpp/android-app-core/res
History
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
..
drawable copyright + code reformat 2013-06-26 12:22:26 +04:00
drawable-hdpi icons 2013-07-19 12:20:11 +04:00
drawable-ldpi facebook button substituted with operators in the widget 2013-07-02 16:29:49 +04:00
drawable-mdpi icons 2013-07-19 12:20:11 +04:00
drawable-nodpi wizard changes 2013-06-24 14:30:02 +04:00
drawable-xhdpi icons 2013-07-19 12:20:11 +04:00
drawable-xlarge-hdpi facebook button substituted with operators in the widget 2013-07-02 16:29:49 +04:00
layout widget layout changed 2013-07-02 16:48:27 +04:00
values Merge branch 'master' into dev 2013-09-20 22:14:08 +04:00
values-de translations 2013-09-20 22:01:40 +04:00
values-es Merge branch 'master' into dev 2013-09-20 22:14:08 +04:00
values-fr translations 2013-09-20 22:01:40 +04:00
values-it Merge branch 'master' into dev 2013-09-20 22:14:08 +04:00
values-nl translations 2013-09-20 22:01:40 +04:00
values-pl polish translation 2013-07-21 00:54:04 +04:00
values-pt-rbr translations 2013-09-20 22:01:40 +04:00
values-ru Merge branch 'master' into dev 2013-09-20 22:14:08 +04:00
values-uk Merge branch 'master' into dev 2013-09-20 22:14:08 +04:00
values-zh-rtw Merge branch 'master' into dev 2013-09-20 22:14:08 +04:00