opencv/platforms/scripts
Roman Donchenko 81eb4bd8be Merge remote-tracking branch 'origin/2.4'
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
..
ABI_compat_generator.py Some improvements in ABI compatibility checker config generator. 2013-09-12 11:43:13 +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 LibTIFF Win32 API back-end disabled for Windows RT. 2013-08-28 07:31:46 -07:00