opencv/apps/traincascade
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
..
boost.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
boost.h Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
cascadeclassifier.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cascadeclassifier.h Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
CMakeLists.txt Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
features.cpp Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
haarfeatures.cpp Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
haarfeatures.h Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
HOGfeatures.cpp Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
HOGfeatures.h Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
imagestorage.cpp Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
imagestorage.h Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
lbpfeatures.cpp Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
lbpfeatures.h Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
traincascade_features.h Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
traincascade.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00