[ros-rviz] 01/01: Merge tag 'upstream/1.12.1+dfsg'

[Jochen Sprickerhof]

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

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

commit 4a607d5074d364582f573cda6bb3a99970e32f0a
Merge: f3ab5f3 11a5569
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Jul 10 23:37:31 2016 +0200

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

 .travis.yml                                        |  29 ---
 CHANGELOG.rst                                      |  78 ++++++++
 CMakeLists.txt                                     |  54 +++++-
 README.md                                          |   4 +-
 cmake/rviz-extras.cmake.in                         |  21 ++
 package.xml                                        |  12 +-
 plugin_description.xml                             |   2 +-
 rviz.sublime-project                               |  29 +--
 setup.py                                           |   6 +-
 src/CMakeLists.txt                                 |   5 +-
 src/image_view/CMakeLists.txt                      |   4 -
 src/python_bindings/CMakeLists.txt                 |   3 +-
 src/python_bindings/rviz/__init__.py               |   3 +-
 src/python_bindings/sip/configure.py               |  88 ---------
 src/python_bindings/sip/rviz.sip                   |   1 +
 src/rviz/CMakeLists.txt                            |  82 ++------
 src/rviz/add_display_dialog.cpp                    |   4 +
 src/rviz/default_plugin/CMakeLists.txt             |  71 ++-----
 .../interactive_marker_control.cpp                 |   6 +-
 .../interactive_marker_control.h                   |   2 +-
 src/rviz/default_plugin/map_display.cpp            |  42 +++-
 src/rviz/default_plugin/map_display.h              |   2 +
 src/rviz/default_plugin/marker_display.cpp         |  25 +++
 src/rviz/default_plugin/marker_display.h           |   5 +
 .../default_plugin/point_cloud_transformers.cpp    |   2 +
 src/rviz/default_plugin/tf_display.cpp             |  33 ++++
 src/rviz/default_plugin/tf_display.h               |   4 +
 src/rviz/default_plugin/wrench_display.cpp         | 215 ++++++++++-----------
 src/rviz/default_plugin/wrench_display.h           |  66 +++----
 src/rviz/default_plugin/wrench_visual.cpp          | 166 +++++++++-------
 src/rviz/default_plugin/wrench_visual.h            |  16 +-
 src/rviz/display.cpp                               |   5 +-
 src/rviz/display_factory.cpp                       |   4 +
 src/rviz/displays_panel.cpp                        |  47 +++++
 src/rviz/displays_panel.h                          |   3 +
 src/rviz/image/image_display_base.cpp              |  19 +-
 src/rviz/image/image_display_base.h                |   2 +
 src/rviz/main.cpp                                  |   1 +
 src/rviz/message_filter_display.h                  |  13 +-
 src/rviz/ogre_helpers/billboard_line.cpp           |  14 +-
 src/rviz/ogre_helpers/render_system.cpp            |  24 ++-
 src/rviz/ogre_helpers/render_system.h              |   4 +
 src/rviz/ogre_helpers/render_widget.cpp            |  14 +-
 src/rviz/ogre_helpers/render_widget.h              |   4 +
 src/rviz/ogre_helpers/stl_loader.cpp               |  21 +-
 src/rviz/properties/property.cpp                   |   6 +-
 src/rviz/properties/property_tree_delegate.cpp     |   2 +-
 src/rviz/properties/splitter_handle.cpp            |  22 ++-
 src/rviz/viewport_mouse_event.h                    |   3 +-
 src/rviz/visualization_frame.cpp                   |  50 ++++-
 src/rviz/visualization_frame.h                     |   4 +
 src/rviz/visualizer_app.cpp                        |  28 ++-
 src/rviz/visualizer_app.h                          |   4 +
 src/test/CMakeLists.txt                            |  40 +++-
 src/test/color_editor_test.cpp                     |   2 +-
 src/test/line_edit_with_button_test.cpp            |   2 +-
 src/test/meshes/invalid.stl                        | Bin 194 -> 175 bytes
 src/test/meshes/{invalid.stl => valid_extra.stl}   | Bin 194 -> 210 bytes
 src/test/stl_loader_test.cpp                       |   6 +
 59 files changed, 867 insertions(+), 557 deletions(-)

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