Roman Donchenko 6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst modules/features2d/doc/object_categorization.rst modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst modules/gpu/doc/image_filtering.rst modules/gpu/doc/image_processing.rst modules/gpu/doc/video.rst modules/imgproc/doc/miscellaneous_transformations.rst modules/imgproc/doc/object_detection.rst modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst modules/imgproc/src/samplers.cpp modules/ml/doc/k_nearest_neighbors.rst modules/nonfree/doc/feature_detection.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/photo/doc/inpainting.rst modules/ts/include/opencv2/ts.hpp platforms/scripts/camera_build.conf samples/android/camera-calibration/AndroidManifest.xml		2013-08-13 12:56:39 +04:00
..
ABI_compat_generator.py	adding 'ios.h' to ignore list should work on non-Mac)	2013-07-01 10:03:08 +04:00
camera_build.conf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
cmake_android_all_cameras.py	Merge remote-tracking branch 'origin/2.4'	2013-06-05 15:42:07 +04:00
cmake_android_arm.sh	Build fixes. Build scrips reorganized.	2013-05-28 12:27:56 +04:00
cmake_android_mips.sh	Build fixes. Build scrips reorganized.	2013-05-28 12:27:56 +04:00
cmake_android_service.sh	Build fixes. Build scrips reorganized.	2013-05-28 12:27:56 +04:00
cmake_android_x86.sh	Build fixes. Build scrips reorganized.	2013-05-28 12:27:56 +04:00
cmake_arm_gnueabi_hardfp.sh	Build fixes. Build scrips reorganized.	2013-05-28 12:27:56 +04:00
cmake_arm_gnueabi_softfp.sh	Build fixes. Build scrips reorganized.	2013-05-28 12:27:56 +04:00
cmake_carma.sh	Build fixes. Build scrips reorganized.	2013-05-28 12:27:56 +04:00
cmake_winrt.cmd	Windows RT related code cleanup.	2013-06-26 05:44:10 -07:00