gitweb.fperrin.net Git - GpsPrune.git/commit

]> gitweb.fperrin.net Git - GpsPrune.git/commit

projects / GpsPrune.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 086dcad 8b20e3e)

author	Frédéric Perrin <fred@fperrin.net>
	Tue, 20 Oct 2020 19:25:42 +0000 (20:25 +0100)
committer	Frédéric Perrin <fred@fperrin.net>
	Tue, 20 Oct 2020 19:25:42 +0000 (20:25 +0100)
commit	9b2386d166007f68fefcaba8c27a1eefcd67af8b
tree	65c11b379a850f9486f115ae119dd14c8539c883	tree \| snapshot
parent	086dcad158175a0b424f277f3cf37f21a2b44241	commit \| diff
parent	8b20e3e027058cdf6ff52993ee5576193d08667a	commit \| diff

Merge remote-tracking branch 'upstream/master' into fp-integration

14 files changed:

buildtools/build.sh	diff1 \|	diff2 \|	blob \| history
pom.xml	diff1 \|	diff2 \|	blob \| history
src/tim/prune/App.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/FunctionLibrary.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/GpsPrune.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/config/Config.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/data/FileInfo.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/function/AddTimeOffset.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/function/srtm/LookupSrtmFunction.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/gui/MenuManager.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/gui/Viewport.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/gui/map/MapCanvas.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/gui/map/MapTileManager.java	diff1 \|	diff2 \|	blob \| history
src/tim/prune/lang/prune-texts_en.properties	diff1 \|	diff2 \|	blob \| history

GpsPrune is a map-based application for viewing, editing and converting coordinate data from GPS systems.