opencv/platforms/scripts
Roman Donchenko f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +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 WindowsRT availability check reorganized. Build script updated. 2013-08-16 05:22:54 -07:00