Sergey Solovyev c772a4e429 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	android-app-core/res/values-ru/text_about.xml
	android-app-core/res/values-ru/text_wizard.xml
	android-app-core/res/values/text_about.xml
	android-app-core/res/values/text_wizard.xml
	pom.xml

2013-07-03 00:08:50 +04:00

..

drawable

copyright + code reformat

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

drawable-hdpi

facebook button substituted with operators in the widget

2013-07-02 16:29:49 +04:00

drawable-ldpi

facebook button substituted with operators in the widget

2013-07-02 16:29:49 +04:00

drawable-mdpi

facebook button substituted with operators in the widget

2013-07-02 16:29:49 +04:00

drawable-nodpi

wizard changes

2013-06-24 14:30:02 +04:00

drawable-xhdpi

facebook button substituted with operators in the widget

2013-07-02 16:29:49 +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 remote-tracking branch 'origin/master'

2013-07-03 00:08:50 +04:00

values-es

release notes moved to separate file

2013-06-26 21:29:53 +04:00

values-it

release notes moved to separate file

2013-06-26 21:29:53 +04:00

values-ru

Merge remote-tracking branch 'origin/master'

2013-07-03 00:08:50 +04:00

values-uk

release notes moved to separate file

2013-06-26 21:29:53 +04:00

values-zh-rtw

wizard finished

2013-07-01 13:00:02 +04:00