Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 7 Apr 2014 10:59:34 +0000 (14:59 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 7 Apr 2014 10:59:34 +0000 (14:59 +0400)
commit4f2b126b7bebbaf3d093baa08894dd02e71639d5
treea5503b87bda0b0537b5c49bf00aad9068508f12e
parentdef4f5e2a3d9d3e0b941f17b97bd6e7b90add57e
parent1cee868e88c0fb158a8e27b13506a95b9594a938
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/core/src/out.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/generalized_hough.cpp
modules/nonfree/perf/perf_main.cpp
doc/tutorials/tutorials.rst
doc/tutorials/video/table_of_content_video/table_of_content_video.rst
modules/contrib/doc/facerec/facerec_api.rst
modules/core/src/out.cpp
modules/cuda/doc/introduction.rst
modules/cudabgsegm/test/test_bgsegm.cpp