[ros] 01/02: Merge tag 'upstream/1.12.4'

[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.

commit 417827c3ef401ae24cb0e8b98b54bc027584afd4
Merge: fa272bf 95ba27f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Oct 13 12:08:07 2015 +0200

    Merge tag 'upstream/1.12.4'
    
    Upstream version 1.12.4

 core/mk/CHANGELOG.rst              |  3 +++
 core/mk/package.xml                |  2 +-
 core/rosbuild/CHANGELOG.rst        |  3 +++
 core/rosbuild/package.xml          |  2 +-
 core/roslang/CHANGELOG.rst         |  3 +++
 core/roslang/package.xml           |  2 +-
 core/roslib/CHANGELOG.rst          |  4 ++++
 core/roslib/package.xml            |  4 ++--
 core/roslib/src/roslib/packages.py | 11 ++++++++++-
 ros/package.xml                    |  2 +-
 tools/rosbash/CHANGELOG.rst        |  4 ++++
 tools/rosbash/package.xml          |  2 +-
 tools/rosbash/roszsh               | 13 ++++++-------
 tools/rosboost_cfg/CHANGELOG.rst   |  3 +++
 tools/rosboost_cfg/package.xml     |  2 +-
 tools/rosclean/CHANGELOG.rst       |  3 +++
 tools/rosclean/package.xml         |  2 +-
 tools/roscreate/CHANGELOG.rst      |  3 +++
 tools/roscreate/package.xml        |  2 +-
 tools/rosmake/CHANGELOG.rst        |  3 +++
 tools/rosmake/package.xml          |  2 +-
 tools/rosunit/CHANGELOG.rst        |  3 +++
 tools/rosunit/package.xml          |  2 +-
 23 files changed, 60 insertions(+), 20 deletions(-)

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