[jmapviewer] 02/04: Merge tag 'upstream/1.17+dfsg'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository jmapviewer.

commit ce38822eaf61076f4bc9125476dbf793ad9710bf
Merge: a86632e a79156a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jul 11 11:04:51 2016 +0200

    Merge tag 'upstream/1.17+dfsg'
    
    Upstream version 1.17+dfsg

 src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java      | 3 ++-
 src/org/openstreetmap/gui/jmapviewer/Demo.java                      | 2 +-
 src/org/openstreetmap/gui/jmapviewer/OsmMercator.java               | 2 +-
 src/org/openstreetmap/gui/jmapviewer/Tile.java                      | 4 ++++
 .../openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java  | 4 ----
 .../gui/jmapviewer/tilesources/TemplatedTMSTileSource.java          | 6 +++---
 6 files changed, 11 insertions(+), 10 deletions(-)

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