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

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository gpsprune.

commit 6caaeecfd02b1a11b58ee8761adee95cdfa49821
Merge: 1144d1f c1dbaed
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 12:05:24 2016 +0200

    Merge tag 'upstream/18.4'
    
    Upstream version 18.4

 build.sh                                     |  2 +-
 tim/prune/GpsPrune.java                      |  6 ++---
 tim/prune/function/AboutScreen.java          |  2 +-
 tim/prune/function/browser/UrlGenerator.java | 19 --------------
 tim/prune/gui/MenuManager.java               |  4 ---
 tim/prune/lang/prune-texts_af.properties     |  2 --
 tim/prune/lang/prune-texts_cz.properties     |  3 ++-
 tim/prune/lang/prune-texts_de.properties     |  2 --
 tim/prune/lang/prune-texts_de_CH.properties  |  4 +--
 tim/prune/lang/prune-texts_en.properties     |  2 --
 tim/prune/lang/prune-texts_es.properties     | 11 ++++++--
 tim/prune/lang/prune-texts_fr.properties     |  2 --
 tim/prune/lang/prune-texts_hu.properties     |  4 +--
 tim/prune/lang/prune-texts_it.properties     |  5 ++--
 tim/prune/lang/prune-texts_nl.properties     |  2 --
 tim/prune/lang/prune-texts_pl.properties     |  9 +++++--
 tim/prune/lang/prune-texts_pt.properties     |  2 --
 tim/prune/lang/prune-texts_ro.properties     |  2 --
 tim/prune/lang/prune-texts_ru.properties     |  5 +++-
 tim/prune/load/BabelFileFormats.java         | 35 +++++++++----------------
 tim/prune/readme.txt                         | 12 ++++++---
 tim/prune/save/GpsSaver.java                 | 39 ++++++++++++++++++++++++++++
 22 files changed, 92 insertions(+), 82 deletions(-)

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