Roman Donchenko 029fce10c9 Merge remote-tracking branch 'origin/2.4' ... Conflicts: 3rdparty/libjasper/CMakeLists.txt cmake/OpenCVDetectOpenCL.cmake modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst modules/imgproc/src/floodfill.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/arithm.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/initialization.cpp modules/ocl/src/matrix_operations.cpp modules/ocl/src/mcwutil.cpp modules/ocl/src/opencl/arithm_bitwise_and_mask.cl modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl modules/ocl/src/opencl/arithm_bitwise_or.cl modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl modules/ocl/src/opencl/arithm_bitwise_xor.cl modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl modules/ocl/src/stereobm.cpp modules/ocl/test/precomp.hpp modules/python/src2/api modules/ts/src/ts_func.cpp samples/gpu/bgfg_segm.cpp		2013-05-21 17:19:23 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4'	2013-05-21 17:19:23 +04:00
include/opencv2	Move C API of opencv_calib3d to separate file	2013-04-11 21:00:17 +04:00
perf	Move C API of opencv_calib3d to separate file	2013-04-11 21:00:17 +04:00
src	Added #include <limits> to files that were missing it.	2013-05-06 22:45:11 -04:00
test	Move C API of opencv_calib3d to separate file	2013-04-11 21:00:17 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00