[gpsprune] 02/10: Merge tag 'upstream/18.2'

[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 e7c3ac8dcf67e0d785a4704f21905777ec468a38
Merge: 2e9a257 91e3175
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 17 01:55:37 2015 +0100

    Merge tag 'upstream/18.2'
    
    Upstream version 18.2

 build.sh                                          |   2 +-
 tim/prune/GpsPrune.java                           |   4 +-
 tim/prune/function/AboutScreen.java               |   6 +-
 tim/prune/function/search/wikimedia_galleries.txt |   4 +-
 tim/prune/gui/images/add_photo_icon.png           | Bin
 tim/prune/gui/images/add_textfile_icon.png        | Bin
 tim/prune/lang/prune-texts_da.properties          |  84 -------------
 tim/prune/lang/prune-texts_fa.properties          |  73 -----------
 tim/prune/lang/prune-texts_in.properties          | 111 -----------------
 tim/prune/lang/prune-texts_it.properties          |   7 ++
 tim/prune/lang/prune-texts_nl.properties          |  23 ++--
 tim/prune/lang/prune-texts_no.properties          | 142 ----------------------
 tim/prune/lang/prune-texts_pl.properties          |   9 ++
 tim/prune/lang/prune-texts_sv.properties          | 102 ----------------
 tim/prune/readme.txt                              |  12 +-
 tim/prune/save/GpxExporter.java                   |   4 +-
 tim/prune/save/KmlExporter.java                   |   4 +-
 tim/prune/save/xml/XmlUtils.java                  |  26 +++-
 18 files changed, 71 insertions(+), 542 deletions(-)

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