[ros-robot-model] 02/05: Merge tag 'upstream/1.12.4'

[Jochen Sprickerhof]

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

jspricke pushed a commit to annotated tag debian/1.12.4-1
in repository ros-robot-model.

commit e43e47d781e41429415628cff2d806018bcac095
Merge: 939fbf2 2c2faf0
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Sep 20 13:44:10 2016 +0200

    Merge tag 'upstream/1.12.4'
    
    Upstream version 1.12.4

 collada_parser/CHANGELOG.rst                     | 3 +++
 collada_parser/package.xml                       | 2 +-
 collada_urdf/CHANGELOG.rst                       | 5 +++++
 collada_urdf/CMakeLists.txt                      | 8 +++++++-
 collada_urdf/include/collada_urdf/collada_urdf.h | 7 +++++++
 collada_urdf/package.xml                         | 2 +-
 collada_urdf/src/collada_urdf.cpp                | 8 +++++++-
 collada_urdf/src/urdf_to_collada.cpp             | 6 ++++++
 joint_state_publisher/CHANGELOG.rst              | 3 +++
 joint_state_publisher/package.xml                | 2 +-
 kdl_parser/CHANGELOG.rst                         | 3 +++
 kdl_parser/package.xml                           | 2 +-
 kdl_parser_py/CHANGELOG.rst                      | 3 +++
 kdl_parser_py/package.xml                        | 2 +-
 robot_model/CHANGELOG.rst                        | 3 +++
 robot_model/package.xml                          | 2 +-
 urdf/CHANGELOG.rst                               | 3 +++
 urdf/package.xml                                 | 2 +-
 urdf_parser_plugin/CHANGELOG.rst                 | 3 +++
 urdf_parser_plugin/package.xml                   | 2 +-
 20 files changed, 61 insertions(+), 10 deletions(-)

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