[gpsprune] 03/06: Merge tag 'upstream/18.6'

[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 e0ccef85b7bfc89b188b76e33ec3d5c7b34e1779
Merge: 698c41a 7f2c626
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Dec 19 07:21:35 2016 +0100

    Merge tag 'upstream/18.6'
    
    Upstream version 18.6

 build.sh                                          |  2 +-
 tim/prune/GpsPrune.java                           |  4 ++--
 tim/prune/function/CheckVersionScreen.java        |  2 +-
 tim/prune/function/srtm/DownloadSrtmFunction.java |  2 +-
 tim/prune/function/srtm/LookupSrtmFunction.java   |  3 ++-
 tim/prune/function/srtm/TileFinder.java           |  2 +-
 tim/prune/lang/prune-texts_es.properties          |  9 ++++++---
 tim/prune/lang/prune-texts_fr.properties          | 14 ++++++++++++--
 tim/prune/readme.txt                              | 13 +++++++++----
 9 files changed, 35 insertions(+), 16 deletions(-)

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