Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt modules/highgui/src/cap.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/color.cpp modules/ocl/src/gftt.cpp modules/ocl/src/imgproc.cpp samples/ocl/facedetect.cpp		2013-12-23 18:50:17 +04:00
..
test_drawing.cpp
test_ffmpeg.cpp
test_fourcc.cpp
test_framecount.cpp
test_grfmt.cpp
test_gui.cpp
test_main.cpp
test_positioning.cpp
test_precomp.hpp
test_video_io.cpp
test_video_pos.cpp