[catkin] 02/05: Merge tag 'upstream/0.6.14'

[Jochen Sprickerhof]

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

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

commit f4a96e7a375dc72ec83f62e951c64c97895d47ab
Merge: 1178482 5c56d05
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Apr 23 23:00:51 2015 +0200

    Merge tag 'upstream/0.6.14'
    
    Upstream version 0.6.14

 CHANGELOG.rst                                      |  26 ++++
 bin/catkin_make                                    |   6 +-
 bin/catkin_test_results                            |  11 +-
 cmake/all.cmake                                    |   6 +-
 cmake/catkin_download.cmake                        |  73 ++++++++++
 cmake/catkin_libraries.cmake                       |   4 +-
 cmake/catkin_workspace.cmake                       |   6 +
 .../05.catkin-test-results.bat.develspace.in       |   4 -
 .../05.catkin-test-results.sh.develspace.in        |   4 -
 cmake/templates/__init__.py.in                     |   1 +
 cmake/templates/_setup_util.py.in                  |   1 +
 cmake/templates/generate_cached_setup.py.in        |   1 +
 cmake/templates/pkgConfig.cmake.in                 |   8 +-
 cmake/templates/relay.py.in                        |   1 +
 cmake/templates/script.py.in                       |   1 +
 cmake/templates/setup.sh.in                        |  17 ++-
 cmake/templates/setup.zsh.in                       |   2 +-
 cmake/test/catkin_download_test_data.cmake         |  25 ++--
 cmake/test/download_checkmd5.py                    |   9 +-
 cmake/test/gtest.cmake                             |  60 ++++++--
 cmake/test/tests.cmake                             |   2 +-
 doc/conf.py                                        |  13 +-
 doc/dev_guide/generated_cmake_api.rst              | 160 +++++++++++++++------
 doc/generate_cmake_rst.py                          |  61 +++++---
 doc/howto/format1/downloading_test_data.rst        |   2 +-
 doc/howto/format1/python_nose_configuration.rst    |  10 +-
 doc/howto/format1/rostest_configuration.rst        |  23 +++
 doc/howto/format2/downloading_test_data.rst        |   2 +-
 doc/howto/format2/python_nose_configuration.rst    |  16 ++-
 doc/howto/format2/rostest_configuration.rst        |  23 +++
 doc/user_guide/variables.rst                       |   3 +
 package.xml                                        |   2 +-
 python/catkin/builder.py                           |  14 +-
 python/catkin/find_in_workspaces.py                |   4 +-
 python/catkin/test_results.py                      |  12 +-
 test/unit_tests/test_find_in_workspace.py          |   5 +-
 test/unit_tests/test_test_results.py               |  40 ++++++
 37 files changed, 506 insertions(+), 152 deletions(-)

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