[osgearth] 02/09: Merge tag 'upstream/2.8_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 20f74f93fc0f1ff578538d080188250c2964ac1e
Merge: 21cc783 e3bde5b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 9 20:13:19 2016 +0200

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

 CMakeLists.txt                                         |  2 +-
 docs/source/user/tools.rst                             |  4 ++--
 src/applications/osgearth_package/osgearth_package.cpp |  2 +-
 src/applications/osgearth_seed/osgearth_seed.cpp       |  2 +-
 src/osgEarth/GPUClamping.vert.lib.glsl                 |  2 +-
 src/osgEarth/ThreadingUtils.cpp                        | 13 +++++++++++--
 src/osgEarth/Version                                   |  2 +-
 src/osgEarthDrivers/engine_mp/MPGeometry.cpp           | 13 +++++++++++--
 src/osgEarthDrivers/engine_rex/TileNode.cpp            | 13 ++++++++++++-
 src/osgEarthDrivers/osg/OSGTileSource.cpp              |  2 +-
 src/osgEarthFeatures/ExtrudeGeometryFilter.cpp         |  2 +-
 src/osgEarthSplat/Splat.frag.glsl                      | 15 ++++++++++++---
 src/osgEarthSplat/Splat.util.glsl                      |  5 +++--
 src/osgEarthUtil/Graticule.vert.glsl                   |  5 ++++-
 14 files changed, 62 insertions(+), 20 deletions(-)

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