This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer.
commit 4f4ad569f0fa009ce12f771b10131973a7377113 Merge: b1bc139 a6a8413 Author: Bas Couwenberg <[email protected]> Date: Thu Dec 31 13:33:39 2015 +0100 Merge tag 'upstream/1.14+dfsg' Upstream version 1.14+dfsg build.xml | 2 +- .../gui/jmapviewer/AttributionSupport.java | 6 ++-- .../openstreetmap/gui/jmapviewer/Coordinate.java | 2 +- .../gui/jmapviewer/DefaultMapController.java | 2 +- .../openstreetmap/gui/jmapviewer/JMapViewer.java | 38 +++++++++++----------- .../gui/jmapviewer/JMapViewerTree.java | 6 ++-- src/org/openstreetmap/gui/jmapviewer/Layer.java | 2 +- .../openstreetmap/gui/jmapviewer/LayerGroup.java | 2 +- .../gui/jmapviewer/MapMarkerCircle.java | 10 +++--- .../gui/jmapviewer/MapPolygonImpl.java | 2 +- .../gui/jmapviewer/MemoryTileCache.java | 2 +- .../gui/jmapviewer/OsmTileLoader.java | 8 ++--- src/org/openstreetmap/gui/jmapviewer/Tile.java | 8 ++--- .../jmapviewer/checkBoxTree/CheckBoxNodeData.java | 8 ++--- .../checkBoxTree/CheckBoxNodeEditor.java | 2 +- .../checkBoxTree/CheckBoxNodeRenderer.java | 2 +- .../gui/jmapviewer/checkBoxTree/CheckBoxTree.java | 2 +- .../gui/jmapviewer/interfaces/MapMarker.java | 2 +- .../gui/jmapviewer/interfaces/MapPolygon.java | 2 +- .../gui/jmapviewer/interfaces/MapRectangle.java | 2 +- .../tilesources/AbstractMapQuestTileSource.java | 4 +-- .../tilesources/AbstractOsmTileSource.java | 6 ++-- .../tilesources/BingAerialTileSource.java | 7 ++-- .../gui/jmapviewer/tilesources/OsmTileSource.java | 4 +-- .../jmapviewer/tilesources/ScanexTileSource.java | 2 +- .../gui/jmapviewer/tilesources/TMSTileSource.java | 3 +- .../tilesources/TemplatedTMSTileSource.java | 4 +-- .../gui/jmapviewer/tilesources/TileSourceInfo.java | 6 ++-- 28 files changed, 74 insertions(+), 72 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
