1. 05 6月, 2013 1 次提交
  2. 29 5月, 2013 1 次提交
  3. 27 5月, 2013 1 次提交
    • R
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 5ac3b8d5
      Roman Donchenko 提交于
      Pull requests:
      	#904 from ograycode:2.4
      	#905 from bitwangyaoyao:2.4_TVL1
      	#902 from apavlenko:fix_run_py
      	#882 from pengx17:2.4_rewrite_query_info
      
      Conflicts:
      	modules/nonfree/src/surf.ocl.cpp
      	modules/ocl/include/opencv2/ocl/private/util.hpp
      	modules/ocl/src/hog.cpp
      	modules/ocl/src/pyrlk.cpp
      	modules/ocl/src/tvl1flow.cpp
      5ac3b8d5
  4. 23 5月, 2013 4 次提交
  5. 22 5月, 2013 7 次提交
  6. 21 5月, 2013 2 次提交
    • R
      Merge remote-tracking branch 'origin/2.4' · 029fce10
      Roman Donchenko 提交于
      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
    • A
      Merge pull request #902 from apavlenko:fix_run_py · d4255b7f
      Andrey Pavlenko 提交于
      d4255b7f
  7. 20 5月, 2013 5 次提交
  8. 19 5月, 2013 2 次提交
  9. 17 5月, 2013 6 次提交
  10. 16 5月, 2013 2 次提交
  11. 15 5月, 2013 7 次提交
  12. 14 5月, 2013 2 次提交