[rospack] 02/05: Merge tag 'upstream/2.2.5'

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository rospack.

commit 3530f1dd260b9f77786081723635ac425fd99b21
Merge: 9e30bf2 2c0db18
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Dec 12 17:10:21 2014 +0100

    Merge tag 'upstream/2.2.5'
    
    Upstream version 2.2.5

 CHANGELOG.rst                        |  28 +++-
 CMakeLists.txt                       |  18 +--
 include/rospack/rospack.h            |  17 ++-
 include/rospack/rospack_backcompat.h |   2 +-
 package.xml                          |   4 +-
 src/rospack.cpp                      | 215 +++++++++++++++----------------
 src/rospack_backcompat.cpp           |  10 +-
 src/rospack_cmdline.cpp              |  64 +++++-----
 src/rospack_cmdline.h                |   4 +-
 src/rospack_main.cpp                 |   2 +-
 src/rosstack_main.cpp                |   2 +-
 src/utils.cpp                        |  10 +-
 src/utils.h                          |   2 +-
 test/CMakeLists.txt                  |   2 +-
 test/test/utest.cpp                  |  19 ++-
 test/test/utest.py.in                | 240 +++++++++++++++--------------------
 16 files changed, 307 insertions(+), 332 deletions(-)

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