Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Dec 2013 12:31:31 +0000 (16:31 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Dec 2013 08:51:00 +0000 (12:51 +0400)
commit464a010f53f833b427c271610e27d840b426522c
tree0eeeacfe23b6e32ca689774ebf4369d5ffa26583
parent8db53c17602fe1175d757f15633adf494f217b02
parent8f10ca5180d3c62e97f6a2099b5beb225b7df26b
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
14 files changed:
apps/traincascade/imagestorage.cpp
modules/cudaimgproc/src/color.cpp
modules/cudaimgproc/test/test_color.cpp
modules/features2d/src/orb.cpp
modules/highgui/src/window_gtk.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl.hpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/src/brute_force_matcher.cpp
modules/ocl/src/cl_operations.cpp
samples/cpp/CMakeLists.txt
samples/cpp/bagofwords_classification.cpp
samples/cpp/points_classifier.cpp
samples/ocl/facedetect.cpp