[opencv] 61/98: Merge pull request #6279 from terfendail:vt/pythontest_data

[Mattia Rizzolo]

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

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit b8ce65bec8bc88979291248bf3b47499ea8d9131
Merge: da66956 96903dc
Author: Alexander Smorkalov <alexander.smorkalov at itseez.com>
Date:   Thu Mar 17 12:27:12 2016 +0000

    Merge pull request #6279 from terfendail:vt/pythontest_data

 CMakeLists.txt                                    |  6 ++++-
 cmake/OpenCVPackaging.cmake                       |  2 +-
 cmake/templates/opencv_run_all_tests_unix.sh.in   |  2 +-
 data/CMakeLists.txt                               | 32 +++++++++++++++++++++++
 modules/python/test/nonfree_tests/__init__.py     |  0
 modules/python/test/nonfree_tests/nonfree_surf.py | 28 ++++++++++++++++++++
 modules/python/test/test.py                       | 24 +++++------------
 7 files changed, 74 insertions(+), 20 deletions(-)


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