This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osgearth.
commit 1a4764f32fa6d58d9dd2c7f2a1739edc5e529e51
Merge: cbd78e3 4692567
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Feb 7 18:50:37 2018 +0100
Merge tag 'upstream/2.9.0+dfsg'
Upstream version 2.9.0+dfsg
CMakeModules/FindRocksDB.cmake | 6 +--
src/applications/osgearth_manip/osgearth_manip.cpp | 5 +++
src/osgEarth/Map.cpp | 4 +-
src/osgEarth/MapNode.cpp | 4 ++
src/osgEarth/Registry | 13 ++++--
src/osgEarth/Registry.cpp | 39 +++++++++++++++++-
src/osgEarth/ResourceReleaser | 4 ++
src/osgEarth/ResourceReleaser.cpp | 27 +++++++++----
src/osgEarth/SceneGraphCallback | 2 +-
src/osgEarth/SceneGraphCallback.cpp | 18 ++++-----
src/osgEarth/SpatialReference | 9 +++--
src/osgEarth/SpatialReference.cpp | 46 ++++++----------------
src/osgEarth/StateSetCache.cpp | 1 +
src/osgEarth/Version | 2 +-
src/osgEarth/VirtualProgram.cpp | 4 ++
src/osgEarthDrivers/engine_rex/GeometryPool.cpp | 4 +-
src/osgEarthDrivers/engine_rex/MaskGenerator.cpp | 6 ++-
.../engine_rex/RexTerrainEngineNode.cpp | 4 ++
src/osgEarthDrivers/engine_rex/TileNode | 2 +
src/osgEarthDrivers/engine_rex/TileNode.cpp | 16 +++++++-
src/osgEarthDrivers/wms/ReaderWriterWMS.cpp | 4 +-
src/osgEarthTriton/TritonContext | 2 +
src/osgEarthTriton/TritonContext.cpp | 8 ++++
src/osgEarthUtil/Controls.cpp | 4 +-
src/osgEarthUtil/EarthManipulator.cpp | 15 ++++++-
src/osgEarthUtil/TMS.cpp | 2 +-
tests/boston.earth | 6 +--
27 files changed, 172 insertions(+), 85 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osgearth.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
