opencv

Open Source Computer Vision Library https://opencv.org/

Roman Donchenko 9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts: .gitignore CMakeLists.txt doc/CMakeLists.txt modules/calib3d/src/stereosgbm.cpp modules/core/include/opencv2/core/mat.hpp modules/highgui/src/cap_openni.cpp modules/ml/include/opencv2/ml/ml.hpp modules/objdetect/src/hog.cpp modules/ocl/perf/perf_color.cpp modules/ocl/src/arithm.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/optical_flow_farneback.cpp platforms/scripts/camera_build.conf platforms/scripts/cmake_android_all_cameras.py samples/cpp/Qt_sample/main.cpp samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp		11 years ago
..
doc	Merge commit '43aec5ad' into merge-2.4	12 years ago
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	11 years ago
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	11 years ago
test	Merge commit '43aec5ad' into merge-2.4	12 years ago
CMakeLists.txt	Global CMake reorganization:	13 years ago