1. 22 May, 2013 4 commits
  2. 21 May, 2013 1 commit
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' · 029fce10
      Roman Donchenko authored
      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
      029fce10
  3. 20 May, 2013 1 commit
  4. 18 May, 2013 1 commit
  5. 17 May, 2013 3 commits
  6. 16 May, 2013 2 commits
  7. 15 May, 2013 7 commits
  8. 14 May, 2013 7 commits
  9. 13 May, 2013 14 commits