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
..
text_about.xml	Merge remote-tracking branch 'origin/master'	2013-07-03 00:08:50 +04:00
text_functions.xml	translations	2013-07-01 23:37:35 +04:00
text_operators.xml	translations	2013-07-01 23:37:35 +04:00
text_preferences.xml	translations	2013-07-01 23:37:35 +04:00
text_release_notes.xml	release notes moved to separate file	2013-06-26 21:29:53 +04:00
text_strings.xml	translations	2013-07-01 23:37:35 +04:00
text_vars.xml	translations	2013-07-01 23:37:35 +04:00
text_wizard.xml	Merge remote-tracking branch 'origin/master'	2013-07-03 00:08:50 +04:00