[osgearth] 03/08: Merge tag 'upstream/2.9_rc2+dfsg' into experimental

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository osgearth.

commit 5be289f8de7e9ee3cbfce8c493e015f2fcda3d06
Merge: 48b16f3 a78a711
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 25 07:33:16 2018 +0100

    Merge tag 'upstream/2.9_rc2+dfsg' into experimental
    
    Upstream version 2.9~rc2+dfsg

 .../drivers/feature/mapnikvectortiles.rst          |  22 ++
 docs/source/references/drivers/terrain/mp.rst      |   2 +-
 .../drivers/terrain/terrain_options_shared.rst     |   2 +-
 docs/source/references/earthfile.rst               |   4 +-
 .../osgearth_tilesource/osgearth_tilesource.cpp    |  36 +++-
 src/osgEarth/ElevationPool.cpp                     |   2 +-
 src/osgEarth/TerrainLayer.cpp                      |   8 +-
 src/osgEarth/Units                                 |  10 +-
 src/osgEarth/Version                               |   2 +-
 src/osgEarth/catch.hpp                             |   2 +-
 .../agglite/AGGLiteRasterizerTileSource.cpp        |  18 +-
 .../engine_mp/MPEngine.NormalMap.vert.glsl         |   2 +-
 .../engine_mp/MPEngine.vert.model.glsl             |   2 +-
 .../engine_rex/RexEngine.NormalMap.vert.glsl       |   4 +-
 src/osgEarthDrivers/fastdxt/CMakeLists.txt         |   2 +-
 src/osgEarthSymbology/Color.cpp                    |   2 +-
 src/osgEarthSymbology/StyleSheet                   |   5 +
 src/osgEarthSymbology/StyleSheet.cpp               |   3 +
 src/osgEarthUtil/MouseCoordsTool.cpp               |  29 +--
 tests/feature_mapnikvectortiles.earth              | 221 +++++++++++++++++++++
 20 files changed, 311 insertions(+), 67 deletions(-)

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