[jmapviewer] 02/05: Merge tag 'upstream/1.12+dfsg'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository jmapviewer.

commit a0727e5394d1586f0f22153dfa650f90f7a15fd4
Merge: 1b50964 122ea3e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 30 12:31:47 2015 +0100

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

 build.xml                                                 |  4 ++--
 src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java | 15 +++++++--------
 src/org/openstreetmap/gui/jmapviewer/Tile.java            |  1 -
 .../gui/jmapviewer/tilesources/BingAerialTileSource.java  |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

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