[jmapviewer] 02/05: Merge tag 'upstream/1.16+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 8a5acf52c0e5b4b7d6accebd338f04419e0a93f7
Merge: ce28752 d063eea
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon May 30 23:16:16 2016 +0200

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

 build.xml                                          |  2 +-
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   | 15 ++++++++-----
 .../gui/jmapviewer/MemoryTileCache.java            |  2 +-
 .../gui/jmapviewer/OsmTileLoader.java              |  2 +-
 src/org/openstreetmap/gui/jmapviewer/Tile.java     |  2 +-
 .../tilesources/AbstractTMSTileSource.java         |  2 +-
 .../tilesources/BingAerialTileSource.java          | 26 ++++++++++++----------
 7 files changed, 28 insertions(+), 23 deletions(-)

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