1. 25 6月, 2013 1 次提交
    • R
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · f36f8067
      Roman Donchenko 提交于
      Conflicts:
      	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
      	modules/core/include/opencv2/core/core.hpp
      	modules/core/include/opencv2/core/cuda/limits.hpp
      	modules/core/include/opencv2/core/internal.hpp
      	modules/core/src/matrix.cpp
      	modules/nonfree/test/test_features2d.cpp
      	modules/ocl/include/opencv2/ocl/ocl.hpp
      	modules/ocl/src/hog.cpp
      	modules/ocl/test/test_haar.cpp
      	modules/ocl/test/test_objdetect.cpp
      	modules/ocl/test/test_pyrup.cpp
      	modules/ts/src/precomp.hpp
      	samples/ocl/facedetect.cpp
      	samples/ocl/hog.cpp
      	samples/ocl/pyrlk_optical_flow.cpp
      	samples/ocl/surf_matcher.cpp
      f36f8067
  2. 24 6月, 2013 5 次提交
  3. 21 6月, 2013 8 次提交
  4. 20 6月, 2013 6 次提交
  5. 19 6月, 2013 13 次提交
  6. 18 6月, 2013 7 次提交