[jmapviewer] 02/05: Merge tag 'upstream/2.2+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 bf9aea1bbb302b7bee56662bdb8ef06353c1ea7d
Merge: a3993c1 f5ea5bc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 28 09:23:56 2017 +0200

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

 .../gui/jmapviewer/AttributionSupport.java         |  4 ++
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   |  4 +-
 .../jmapviewer/tilesources/AbstractTileSource.java |  3 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  | 61 ++++++++++++++++++++++
 .../jmapviewer/tilesources/ScanexTileSource.java   | 10 ++--
 .../gui/jmapviewer/tilesources/TMSTileSource.java  |  4 +-
 6 files changed, 77 insertions(+), 9 deletions(-)

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