[catkin] 04/07: Merge branch 'master' of git+ssh://alioth-git/git/debian-science/packages/ros/catkin

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch debian-robotics
in repository catkin.

commit ba05a9e16e8d273ba5ff0664aa7b9b391f64e6c8
Merge: 3100f16 4815121
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Fri Jan 16 09:49:50 2015 +0100

    Merge branch 'master' of git+ssh://alioth-git/git/debian-science/packages/ros/catkin

 CHANGELOG.rst                                | 14 +++++
 bin/catkin_make                              | 35 ++++++++---
 bin/catkin_make_isolated                     |  4 +-
 cmake/catkin_workspace.cmake                 |  2 +-
 cmake/env-hooks/05.catkin_make.bash          |  3 +
 cmake/env-hooks/05.catkin_make_isolated.bash |  3 +
 cmake/templates/setup.zsh.in                 |  6 +-
 cmake/test/download_checkmd5.py              | 54 ++++++++++-------
 cmake/test/run_tests.py                      | 52 ++--------------
 debian/changelog                             | 10 +++-
 package.xml                                  |  2 +-
 python/catkin/builder.py                     | 90 +++++++++++++++++++++-------
 python/catkin/test_results.py                | 62 ++++++++++++++++++-
 test/unit_tests/test_download_md5.py         |  2 +-
 14 files changed, 228 insertions(+), 111 deletions(-)

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