[jmapviewer] 06/13: Merge tag 'upstream/1.11+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 a00ca5ee57902e0e3c15ad892207726c60d62c8c
Merge: 1ac3034 3782404
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 9 10:37:59 2015 +0200

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

 build.xml                                          |   2 +-
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   |  36 ++--
 .../gui/jmapviewer/JobDispatcher.java              | 183 ---------------------
 .../gui/jmapviewer/OsmTileLoader.java              |  10 +-
 src/org/openstreetmap/gui/jmapviewer/Tile.java     |  11 +-
 .../gui/jmapviewer/TileController.java             |   9 +-
 .../gui/jmapviewer/events/JMVCommandEvent.java     |   2 +-
 .../gui/jmapviewer/interfaces/TileLoader.java      |   6 +
 .../gui/jmapviewer/interfaces/TileSource.java      | 114 -------------
 .../tilesources/AbstractMapQuestTileSource.java    |   9 +-
 .../tilesources/AbstractTMSTileSource.java         |  40 -----
 .../tilesources/BingAerialTileSource.java          |  13 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  |  10 --
 .../jmapviewer/tilesources/ScanexTileSource.java   |  23 ---
 .../gui/jmapviewer/tilesources/TMSTileSource.java  |   5 -
 15 files changed, 50 insertions(+), 423 deletions(-)

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