[jmapviewer] 02/06: Merge tag 'upstream/2.3+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 b277c697daa5cd5a57a8f557d45e3e08f442e4ae
Merge: 8af26e1 c0bbd32
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 29 10:21:38 2017 +0200

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

 Readme.txt                                                           | 4 ++--
 build.xml                                                            | 2 +-
 src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java              | 2 +-
 .../gui/jmapviewer/tilesources/TemplatedTMSTileSource.java           | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

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