c772a4e429
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 |
||
---|---|---|
.. | ||
assets | ||
misc | ||
res | ||
src | ||
AndroidManifest.xml | ||
pom.xml | ||
proguard.cfg | ||
project.properties |