merged the trunk r8669:8702
authorMarina Kolpakova <no@email>
Thu, 28 Jun 2012 15:41:27 +0000 (15:41 +0000)
committerMarina Kolpakova <no@email>
Thu, 28 Jun 2012 15:41:27 +0000 (15:41 +0000)
commit6cca6a45482ae0650d13ee1550724b32c9a76b7c
tree57817b977c150990879adb04d8aa28221a87f29b
parent150aeee58fc39c11293ee7271aa182a23406c84f
merged the trunk r8669:8702
50 files changed:
3rdparty/tbb/CMakeLists.txt
cmake/OpenCVConfig.cmake [new file with mode: 0644]
cmake/OpenCVDetectTBB.cmake
cmake/OpenCVModule.cmake
cmake/OpenCVPCHSupport.cmake
cmake/OpenCVUtils.cmake
doc/tutorials/introduction/android_binary_package/android_binary_package.rst
modules/contrib/src/rgbdodometry.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/src/persistence.cpp
modules/gpu/perf/perf_core.cpp [new file with mode: 0644]
modules/gpu/src/brute_force_matcher.cpp
modules/gpu/src/cuda/bf_knnmatch.cu
modules/gpu/src/cuda/bf_match.cu
modules/gpu/src/cuda/bf_radius_match.cu
modules/gpu/src/cuda/bilateral_filter.cu
modules/gpu/src/cuda/blend.cu
modules/gpu/src/cuda/calib3d.cu
modules/gpu/src/cuda/canny.cu
modules/gpu/src/cuda/color.cu
modules/gpu/src/cuda/column_filter.cu
modules/gpu/src/cuda/copy_make_border.cu
modules/gpu/src/cuda/fast.cu
modules/gpu/src/cuda/gftt.cu
modules/gpu/src/cuda/hist.cu
modules/gpu/src/cuda/hog.cu
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/internal_shared.hpp
modules/gpu/src/cuda/match_template.cu
modules/gpu/src/cuda/mathfunc.cu
modules/gpu/src/cuda/matrix_reductions.cu
modules/gpu/src/cuda/optical_flow.cu
modules/gpu/src/cuda/orb.cu
modules/gpu/src/cuda/remap.cu
modules/gpu/src/cuda/resize.cu
modules/gpu/src/cuda/row_filter.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/cuda/split_merge.cu
modules/gpu/src/cuda/stereobm.cu
modules/gpu/src/cuda/stereobp.cu
modules/gpu/src/cuda/stereocsbp.cu
modules/gpu/src/cuda/warp.cu
modules/gpu/src/hog.cpp
modules/gpu/src/mssegmentation.cpp
modules/gpu/src/opencv2/gpu/device/warp_reduce.hpp
modules/gpu/src/stereocsbp.cpp
modules/ml/doc/support_vector_machines.rst
samples/android/fix_properties.bat
samples/cpp/rgbdodometry.cpp
samples/python2/kmeans.py [new file with mode: 0644]