[gpsprune] 02/06: Merge tag 'upstream/17.1'

[Mònica Ramírez Arceda]

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

monica pushed a commit to branch master
in repository gpsprune.

commit f5fcec120a74fc9de8607b3e7c589c06e74a86ea
Merge: 4e13a33 3c17518
Author: Mònica Ramírez Arceda <monica at debian.org>
Date:   Thu Oct 30 11:57:26 2014 +0100

    Merge tag 'upstream/17.1'
    
    Upstream version 17.1

 build.sh                                   |   2 +-
 tim/prune/App.java                         |   2 +-
 tim/prune/GpsPrune.java                    |   4 +-
 tim/prune/data/Coordinate.java             |   2 +-
 tim/prune/data/Track.java                  |   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_es.properties   |  73 +++++++++++++------
 tim/prune/lang/prune-texts_fa.properties   |  73 -------------------
 tim/prune/lang/prune-texts_fr.properties   |  26 ++++---
 tim/prune/lang/prune-texts_in.properties   | 111 -----------------------------
 tim/prune/lang/prune-texts_it.properties   |   6 +-
 tim/prune/lang/prune-texts_ro.properties   |   8 ++-
 tim/prune/lang/prune-texts_sv.properties   | 102 --------------------------
 tim/prune/readme.txt                       |  15 ++--
 tim/prune/threedee/TerrainHelper.java      |   4 +-
 17 files changed, 100 insertions(+), 416 deletions(-)

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