opencv/modules/imgproc/doc
Roman Donchenko 4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
..
pics Merge remote-tracking branch 'upstream/master' 2013-09-26 23:08:23 +10:00
feature_detection.rst fixed description of createLineSegmentDetector 2013-09-30 15:07:32 +04:00
filtering.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
geometric_transformations.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
histograms.rst Merge pull request #1248 from vkocheganov:chi_square_alt 2013-08-28 11:44:41 +04:00
imgproc.rst merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
miscellaneous_transformations.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
motion_analysis_and_object_tracking.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
object_detection.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
structural_analysis_and_shape_descriptors.rst Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00