[jmapviewer] 02/04: Merge tag 'upstream/1.18+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 730a5d811fd5a20e162dd8018819cffdab509f9c
Merge: d2febe3 eff9c99
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jul 18 13:28:48 2016 +0200

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

 src/org/openstreetmap/gui/jmapviewer/Demo.java     |  5 +----
 .../gui/jmapviewer/MemoryTileCache.java            |  5 +++++
 src/org/openstreetmap/gui/jmapviewer/Tile.java     |  7 +++++++
 src/org/openstreetmap/gui/jmapviewer/TileXY.java   | 10 +++++-----
 .../tilesources/MapQuestOpenAerialTileSource.java  | 23 ----------------------
 .../tilesources/MapQuestOsmTileSource.java         | 19 ------------------
 6 files changed, 18 insertions(+), 51 deletions(-)

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