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 |
|
Solovyev_S
|
33acdd68e6
|
translations
|
2013-07-02 16:43:48 +04:00 |
|
Sergey Solovyev
|
f40740d531
|
translations
|
2013-07-01 23:45:12 +04:00 |
|
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 |
|
Sergey Solovyev
|
6f15e03543
|
translations
|
2013-07-01 23:37:35 +04:00 |
|
Solovyev_S
|
ac43c9b25a
|
translations
|
2013-07-01 13:23:25 +04:00 |
|