[jmapviewer] 02/13: Merge tag 'upstream/1.09+dfsg'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository jmapviewer.

commit 85ed565f7745fb4358c1272bfcc45d4509cd66a7
Merge: cd7695b 346f2a4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 9 10:37:47 2015 +0200

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

 .../openstreetmap/gui/jmapviewer/JMapViewer.java   |   2 +-
 .../openstreetmap/gui/jmapviewer/OsmMercator.java  |  60 ++++++---
 .../gui/jmapviewer/OsmTileLoader.java              |  14 +-
 src/org/openstreetmap/gui/jmapviewer/Tile.java     |  50 ++++++-
 .../gui/jmapviewer/interfaces/TileJob.java         |   6 +
 .../gui/jmapviewer/interfaces/TileSource.java      |  25 +++-
 src/org/openstreetmap/gui/jmapviewer/package.html  |   2 +-
 .../tilesources/AbstractOsmTileSource.java         |   6 +-
 .../tilesources/AbstractTMSTileSource.java         |  77 ++++++++---
 .../jmapviewer/tilesources/AbstractTileSource.java |   8 +-
 .../tilesources/BingAerialTileSource.java          |   9 +-
 .../jmapviewer/tilesources/ScanexTileSource.java   |  10 +-
 .../gui/jmapviewer/tilesources/TMSTileSource.java  |  14 +-
 .../tilesources/TemplatedTMSTileSource.java        |  22 +---
 .../gui/jmapviewer/tilesources/TileSourceInfo.java | 143 +++++++++++++++++++++
 15 files changed, 369 insertions(+), 79 deletions(-)

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