[ros-vision-opencv] 01/03: Merge tag 'upstream/1.11.11+ds'

[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-vision-opencv.

commit 6b8a56b9665a4e3ae66fc1b30e9f7d37b43f4e6b
Merge: 17a6dda 3d1fc76
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Feb 5 10:12:26 2016 +0100

    Merge tag 'upstream/1.11.11+ds'
    
    Upstream version 1.11.11+ds

 cv_bridge/CHANGELOG.rst                 |  6 ++++++
 cv_bridge/{ => doc}/conf.py             |  7 +------
 cv_bridge/{ => doc}/index.rst           |  0
 cv_bridge/{ => doc}/mainpage.dox        |  0
 cv_bridge/include/cv_bridge/cv_bridge.h |  5 ++---
 cv_bridge/package.xml                   | 18 ++++++++++--------
 cv_bridge/python/cv_bridge/core.py      | 12 ++++++------
 cv_bridge/rosdoc.yaml                   |  2 +-
 image_geometry/CHANGELOG.rst            |  6 ++++++
 image_geometry/{ => doc}/conf.py        |  7 +------
 image_geometry/{ => doc}/index.rst      |  2 +-
 image_geometry/{ => doc}/mainpage.dox   |  0
 image_geometry/package.xml              | 12 +++++++-----
 image_geometry/rosdoc.yaml              |  1 +
 image_geometry/test/directed.py         |  3 ---
 opencv_apps/CHANGELOG.rst               |  6 ++++++
 opencv_apps/CMakeLists.txt              | 22 ++++++++++++++++++----
 opencv_apps/package.xml                 |  3 +--
 opencv_apps/test/CMakeLists.txt         |  5 ++++-
 opencv_apps/test/test-lk_flow.test      |  2 +-
 opencv_tests/CHANGELOG.rst              |  5 +++++
 opencv_tests/package.xml                |  6 +++---
 vision_opencv/CHANGELOG.rst             |  3 +++
 vision_opencv/package.xml               |  2 +-
 24 files changed, 84 insertions(+), 51 deletions(-)

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