1. 06 Nov, 2013 1 commit
  2. 05 Nov, 2013 1 commit
  3. 29 Oct, 2013 5 commits
  4. 28 Oct, 2013 1 commit
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 78be4f66
      Roman Donchenko authored
      Conflicts:
      	CMakeLists.txt
      	modules/calib3d/src/calibration.cpp
      	modules/ocl/src/cl_programcache.cpp
      	modules/ocl/src/filtering.cpp
      	modules/ocl/src/imgproc.cpp
      	samples/ocl/adaptive_bilateral_filter.cpp
      	samples/ocl/bgfg_segm.cpp
      	samples/ocl/clahe.cpp
      	samples/ocl/facedetect.cpp
      	samples/ocl/pyrlk_optical_flow.cpp
      	samples/ocl/squares.cpp
      	samples/ocl/surf_matcher.cpp
      	samples/ocl/tvl1_optical_flow.cpp
      78be4f66
  5. 25 Oct, 2013 20 commits
  6. 24 Oct, 2013 12 commits