Merged the trunk r8384:8407 (inclusive)
authorAndrey Kamaev <no@email>
Wed, 30 May 2012 08:04:37 +0000 (08:04 +0000)
committerAndrey Kamaev <no@email>
Wed, 30 May 2012 08:04:37 +0000 (08:04 +0000)
commit7b5a45eac48a84733f483b2c27b937b24434253c
treeced0ec0bb459e81b10575be0e53785e11c0365f2
parent72d2311edf27f05be777482062fcae83a4f69559
Merged the trunk r8384:8407 (inclusive)
21 files changed:
CMakeLists.txt
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVUtils.cmake
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/src/features2d_init.cpp
modules/highgui/CMakeLists.txt
modules/highgui/src/window_w32.cpp
modules/imgproc/src/utils.cpp
modules/ml/src/ml_init.cpp
modules/nonfree/src/nonfree_init.cpp
modules/video/include/opencv2/video/tracking.hpp
modules/video/perf/perf_optflowpyrlk.cpp
modules/video/src/lkpyramid.cpp
modules/video/src/lkpyramid.hpp [new file with mode: 0644]
modules/video/src/video_init.cpp
samples/cpp/bagofwords_classification.cpp
samples/cpp/descriptor_extractor_matcher.cpp