[jmapviewer] 02/06: Merge tag 'upstream/2.5+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 f2a5652bfe05a9146ed0a977d42e940927933c42
Merge: 7cde07a acbf756
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 27 08:28:55 2018 +0100

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

 Readme.txt                                            |  4 ++--
 .../gui/jmapviewer/interfaces/TileSource.java         |  7 +++++++
 .../jmapviewer/tilesources/AbstractTMSTileSource.java |  7 +++++++
 .../gui/jmapviewer/tilesources/OsmTileSource.java     |  1 +
 .../gui/jmapviewer/tilesources/TileSourceInfo.java    | 19 +++++++++++++++++++
 5 files changed, 36 insertions(+), 2 deletions(-)

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