[rviz] 01/02: Merge tag 'upstream/1.11.9'

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository rviz.

commit ba1489a5089e8d66da263a4cb4c2705f3ecd657f
Merge: 1b63939 75e968b
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Sep 27 09:12:51 2015 +0200

    Merge tag 'upstream/1.11.9'
    
    Upstream version 1.11.9

 CHANGELOG.rst                                  |  27 +++++++++++++++++++++++++
 package.xml                                    |   2 +-
 src/rviz/default_plugin/map_display.cpp        |   4 ++++
 src/rviz/default_plugin/map_display.h          |   1 +
 src/rviz/display.cpp                           |   4 ++++
 src/rviz/ogre_helpers/stl_loader.cpp           |   4 ++--
 src/rviz/tool_manager.cpp                      |  13 +++++++++++-
 src/test/meshes/16bit_vs_32bit_should_fail.stl | Bin 0 -> 184 bytes
 src/test/stl_loader_test.cpp                   |   5 +++++
 9 files changed, 56 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/rviz.git