[ros-ros] 02/04: Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/ros-ros

[Wookey]

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

wookey pushed a commit to branch master
in repository ros-ros.

commit 510aabc0ffafcb51619b994859b893f4e81bac80
Merge: dcc48da 27018e6
Author: Wookey <wookey at wookware.org>
Date:   Tue Nov 17 03:14:58 2015 +0000

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/ros-ros

 .../patches/0005-Fix-location-of-etc-ros-dir.patch  | 21 +++++++++++++++++++++
 .../0006-Add-default-ROS_ROOT-to-rosmake.patch      | 21 +++++++++++++++++++++
 debian/patches/series                               |  2 ++
 debian/rosbash.install                              |  1 +
 4 files changed, 45 insertions(+)

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