This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository jmapviewer.
commit 1d9537ea5fb41538aec8afd26f7565698968408c
Merge: bfb3377 43dc394
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Thu Mar 5 08:31:12 2015 +0100
Merge tag 'upstream/1.06+dfsg'
Upstream version 1.06+dfsg
Readme.txt | 6 +-
.../gui/jmapviewer/AbstractLayer.java | 176 +-
.../openstreetmap/gui/jmapviewer/Coordinate.java | 158 +-
.../gui/jmapviewer/DefaultMapController.java | 358 ++--
src/org/openstreetmap/gui/jmapviewer/Demo.java | 528 ++---
.../gui/jmapviewer/JMapController.java | 68 +-
.../openstreetmap/gui/jmapviewer/JMapViewer.java | 2220 ++++++++++----------
.../gui/jmapviewer/JobDispatcher.java | 352 ++--
.../gui/jmapviewer/MapMarkerCircle.java | 212 +-
.../openstreetmap/gui/jmapviewer/MapMarkerDot.java | 104 +-
.../gui/jmapviewer/MemoryTileCache.java | 452 ++--
.../gui/jmapviewer/OsmFileCacheTileLoader.java | 1007 ++++-----
.../openstreetmap/gui/jmapviewer/OsmMercator.java | 348 +--
.../gui/jmapviewer/OsmTileLoader.java | 256 +--
src/org/openstreetmap/gui/jmapviewer/Tile.java | 668 +++---
.../gui/jmapviewer/TileController.java | 174 +-
.../gui/jmapviewer/interfaces/MapMarker.java | 108 +-
.../gui/jmapviewer/interfaces/MapRectangle.java | 76 +-
.../gui/jmapviewer/interfaces/TileCache.java | 100 +-
.../gui/jmapviewer/interfaces/TileJob.java | 40 +-
.../gui/jmapviewer/interfaces/TileLoader.java | 46 +-
.../jmapviewer/interfaces/TileLoaderListener.java | 32 +-
.../gui/jmapviewer/interfaces/TileSource.java | 316 +--
.../tilesources/AbstractTMSTileSource.java | 250 +--
.../tilesources/BingAerialTileSource.java | 610 +++---
.../gui/jmapviewer/tilesources/OsmTileSource.java | 156 +-
.../jmapviewer/tilesources/ScanexTileSource.java | 316 +--
.../gui/jmapviewer/tilesources/TMSTileSource.java | 68 +-
.../tilesources/TemplatedTMSTileSource.java | 183 +-
29 files changed, 4699 insertions(+), 4689 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
