opencv/platforms/scripts
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +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 Normalized file endings. 2013-08-21 18:59:25 +04:00