Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Sep 2013 07:30:19 +0000 (11:30 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Sep 2013 07:30:19 +0000 (11:30 +0400)
commit95c2e8b51fefa8764e14af4be0fdc458fbca16ea
tree4c7d3341aaa61cbdd83c2d6dec869436deb174a6
parent77a2529eb7cb355038359221745671ddc559de57
parent531471b0aa4b4e8f9fcab8282d5cbe895b77e6e0
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
29 files changed:
.gitignore
cmake/OpenCVModule.cmake
doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst
modules/contrib/doc/facerec/facerec_api.rst
modules/flann/include/opencv2/flann/any.h
modules/gpuwarping/src/cuda/resize.cu
modules/imgproc/doc/filtering.rst
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/color.cpp
modules/imgproc/src/imgwarp.cpp
modules/imgproc/src/morph.cpp
modules/imgproc/src/smooth.cpp
modules/imgproc/test/test_imgwarp_strict.cpp
modules/ocl/doc/image_filtering.rst
modules/ocl/include/opencv2/ocl.hpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/bgfg_mog.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/initialization.cpp
modules/ocl/test/test_bgfg.cpp
modules/ocl/test/test_imgproc.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.cpp
modules/ocl/test/utility.hpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp