[gpsprune] 02/04: Merge tag 'upstream/18.5'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gpsprune.

commit 4b8c9ab9c7aa0b99f82908ab12df981a86f816c8
Merge: 7238f1d 7734d05
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 26 12:44:14 2016 +0200

    Merge tag 'upstream/18.5'
    
    Upstream version 18.5

 build.sh                                           |   2 +-
 tim/prune/GpsPrune.java                            |   4 +-
 tim/prune/function/AboutScreen.java                |   3 +-
 .../function/gpsies/UploadGpsiesFunction.java      |   5 +-
 tim/prune/gui/map/DiskTileCacher.java              |  35 +++----
 tim/prune/gui/map/MapCanvas.java                   |   4 +-
 tim/prune/gui/map/MapTile.java                     |  32 ++++++
 tim/prune/gui/map/MapTileManager.java              |  41 ++++----
 tim/prune/gui/profile/ProfileChart.java            |   5 +-
 tim/prune/lang/prune-texts_cz.properties           |   8 ++
 tim/prune/lang/prune-texts_es.properties           |   5 +
 tim/prune/lang/prune-texts_ru.properties           |  29 ++++--
 tim/prune/lang/prune-texts_uk.properties           |  10 ++
 tim/prune/readme.txt                               |  15 ++-
 tim/prune/save/GpsSaver.java                       |   5 +-
 tim/prune/save/GpxExporter.java                    | 108 +++++++++++----------
 tim/prune/save/SettingsForExport.java              |  66 +++++++++++++
 17 files changed, 263 insertions(+), 114 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpsprune.git