299fc66457
Conflicts: OsmAnd/res/values/strings.xml |
||
---|---|---|
.. | ||
attrs.xml | ||
bidforfix.xml | ||
colors.xml | ||
dimens.xml | ||
no_translate.xml | ||
routepoints.xml | ||
sherpafy.xml | ||
strings.xml | ||
styles.xml |
299fc66457
Conflicts: OsmAnd/res/values/strings.xml |
||
---|---|---|
.. | ||
attrs.xml | ||
bidforfix.xml | ||
colors.xml | ||
dimens.xml | ||
no_translate.xml | ||
routepoints.xml | ||
sherpafy.xml | ||
strings.xml | ||
styles.xml |