opencv/samples/ocl
Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
..
adaptive_bilateral_filter.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
bgfg_segm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
clahe.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
CMakeLists.txt Fixed OCL samples' install path being inconsistent with the other samples. 2013-09-04 18:52:03 +04:00
facedetect.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
hog.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
pyrlk_optical_flow.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-25 15:55:52 +04:00
squares.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-25 15:55:52 +04:00
stereo_match.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
surf_matcher.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-25 15:55:52 +04:00
tvl1_optical_flow.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00