[ros] 01/03: Merge tag 'upstream/1.12.1'

[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 576b09f894bb0ba25d69ac128e14def394a4b38d
Merge: 7c4fc6d cad291f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Apr 23 23:01:13 2015 +0200

    Merge tag 'upstream/1.12.1'
    
    Upstream version 1.12.1

 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                    |   2 +-
 core/roslib/src/roslib/rosenv.py           |  17 +-
 ros/package.xml                            |   2 +-
 tools/rosbash/CHANGELOG.rst                |   5 +
 tools/rosbash/CMakeLists.txt               |   4 +-
 tools/rosbash/env-hooks/15.rosbash.fish.em |  10 +
 tools/rosbash/package.xml                  |   2 +-
 tools/rosbash/rosbash                      |  16 +-
 tools/rosbash/rosfish                      | 357 +++++++++++++++++++++++++++++
 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 +-
 26 files changed, 432 insertions(+), 27 deletions(-)

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