[ros-interactive-markers] 02/03: Merge tag 'upstream/1.11.3'

[Jochen Sprickerhof]

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

jspricke pushed a commit to annotated tag debian/1.11.3-1
in repository ros-interactive-markers.

commit 6d258a38bdf11ec577cf1fd83b2fd90fc2b9c6f7
Merge: b0beae2 1d79df3
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Sep 2 11:06:12 2016 +0200

    Merge tag 'upstream/1.11.3'
    
    Upstream version 1.11.3

 CHANGELOG.rst                                          | 18 ++++++++++++++++++
 CMakeLists.txt                                         | 18 +++++++++---------
 include/interactive_markers/detail/state_machine.h     |  5 +++--
 .../interactive_markers/interactive_marker_server.h    | 10 ++++++++++
 package.xml                                            |  2 +-
 src/interactive_marker_client.cpp                      | 12 ++++++++++--
 src/interactive_marker_server.cpp                      | 12 ++++++++++++
 src/interactive_markers/menu_handler.py                |  4 ++--
 8 files changed, 65 insertions(+), 16 deletions(-)

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