Merge remote-tracking branch 'origin/open_GPX' into open_GPX

Browse source

# Conflicts:
#	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java

...

This commit is contained in:

madwasp79 2019-03-05 11:07:14 +02:00

parent d299c0d93d 63f933a9a3

commit d088df6a77

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available