[jmapviewer] 02/04: Merge tag 'upstream/2.6+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 f6addf1e88de832152f4c028f62f36cd9888aea2
Merge: 6697e75 766f83b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 1 15:56:21 2018 +0100

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

 src/org/openstreetmap/gui/jmapviewer/JMapViewer.java           | 10 ++++++++++
 .../gui/jmapviewer/tilesources/TileSourceInfo.java             |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

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