Merged the trunk r8595:8668 (except iOS and new gpu functionality)
authorAndrey Kamaev <no@email>
Fri, 15 Jun 2012 13:21:26 +0000 (13:21 +0000)
committerAndrey Kamaev <no@email>
Fri, 15 Jun 2012 13:21:26 +0000 (13:21 +0000)
commitf666bd221f796d6066f6a604daf361a59a949e9d
tree075acf5a82cda6213dff120eab733ca72dbb9fea
parentbd0e0b5800f940f09aef83fa268d8707f1f01cee
Merged the trunk r8595:8668 (except iOS and new gpu functionality)
47 files changed:
android/android.toolchain.cmake
doc/tutorials/introduction/android_binary_package/android_binary_package.rst
doc/tutorials/introduction/android_binary_package/android_binary_package_using_with_NDK.rst
doc/tutorials/introduction/android_binary_package/images/android_package_7zip.png
doc/tutorials/introduction/android_binary_package/images/android_sdk_and_avd_manager.png
doc/tutorials/introduction/android_binary_package/images/eclipse_10_crystal_clean.png
doc/tutorials/introduction/android_binary_package/images/eclipse_1a_locate_sdk.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_7_select_projects.png
doc/tutorials/introduction/android_binary_package/images/eclipse_8_false_alarm.png
doc/tutorials/introduction/android_binary_package/images/eclipse_8a_target.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_8b_fix_props.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_9_errors_dissapearing.png
doc/tutorials/introduction/android_binary_package/images/eclipse_cdt_cfg1.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_cdt_cfg2.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_cdt_cfg3.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_cdt_cfg4.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_cdt_cfg5.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_inst_cdt.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_inst_cdt_2.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_inst_details.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/eclipse_ndk_build.png [new file with mode: 0644]
doc/tutorials/introduction/android_binary_package/images/ndk_build.png [new file with mode: 0644]
doc/tutorials/introduction/ios_install/ios_install.rst
doc/tutorials/introduction/windows_install/windows_install.rst
modules/contrib/src/rgbdodometry.cpp
modules/flann/include/opencv2/flann/lsh_index.h
modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
modules/gpu/src/nvidia/NCVHaarObjectDetection.cu
modules/gpu/src/nvidia/NPP_staging/NPP_staging.cu
modules/gpu/src/nvidia/core/NCV.cu
modules/gpu/src/nvidia/core/NCV.hpp
modules/highgui/CMakeLists.txt
modules/highgui/src/cap_dshow.cpp
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/src/imgwarp.cpp
modules/imgproc/src/thresh.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/ml/src/boost.cpp
modules/ml/src/svm.cpp
modules/python/CMakeLists.txt
samples/android/face-detection/jni/Android.mk
samples/cpp/letter_recog.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/python2/common.py
samples/python2/find_obj.py
samples/python2/lappyr.py [new file with mode: 0644]
samples/python2/letter_recog.py