This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer.
commit 702f2ccc351f9af28b18d2715b54a6d5b628635c Merge: 09dd61a c84ae8c Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue Mar 1 06:35:21 2016 +0100 Merge tag 'upstream/1.15+dfsg' Upstream version 1.15+dfsg build.xml | 2 +- .../gui/jmapviewer/AttributionSupport.java | 2 +- .../gui/jmapviewer/DefaultMapController.java | 5 +- src/org/openstreetmap/gui/jmapviewer/Demo.java | 3 +- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 161 +++++++++++++++++++-- .../gui/jmapviewer/JMapViewerTree.java | 3 +- src/org/openstreetmap/gui/jmapviewer/Layer.java | 2 +- .../openstreetmap/gui/jmapviewer/OsmMercator.java | 2 +- .../gui/jmapviewer/OsmTileLoader.java | 14 +- src/org/openstreetmap/gui/jmapviewer/Style.java | 2 +- .../jmapviewer/checkBoxTree/CheckBoxNodeData.java | 2 +- .../checkBoxTree/CheckBoxNodeEditor.java | 2 +- .../jmapviewer/checkBoxTree/CheckBoxNodePanel.java | 2 +- .../checkBoxTree/CheckBoxNodeRenderer.java | 6 +- .../jmapviewer/interfaces/TileClearController.java | 2 +- .../tilesources/AbstractOsmTileSource.java | 8 +- .../tilesources/AbstractTMSTileSource.java | 81 +++++------ .../tilesources/BingAerialTileSource.java | 2 +- .../tilesources/MapQuestOsmTileSource.java | 2 +- .../gui/jmapviewer/tilesources/TMSTileSource.java | 53 +++++++ .../gui/jmapviewer/tilesources/TileSourceInfo.java | 22 ++- 21 files changed, 290 insertions(+), 88 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel