Sergey Solovyev 6977b4c6b8 Merge branch 'dev-number-format-in-editor' into dev ... Conflicts: android-app-core/res/values-ru/text_strings.xml android-app-core/res/values-ru/text_wizard.xml android-app-core/res/values/text_strings.xml android-app-core/res/values/text_wizard.xml		2013-07-01 23:39:23 +04:00
..
text_about.xml	translations	2013-07-01 23:37:35 +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 branch 'dev-number-format-in-editor' into dev	2013-07-01 23:39:23 +04:00