opencv/include/opencv
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
..
cv.h Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
cv.hpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
cvaux.h Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
cvaux.hpp Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
cvwimage.h Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
cxcore.h Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
cxcore.hpp Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
cxeigen.hpp Normalized file endings. 2013-08-21 18:59:25 +04:00
cxmisc.h Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
highgui.h Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
ml.h Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00