1. 14 Jan, 2014 1 commit
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · fee2ed37
      Roman Donchenko authored
      Conflicts:
      	modules/contrib/src/retina.cpp
      	modules/core/include/opencv2/core/mat.hpp
      	modules/core/src/algorithm.cpp
      	modules/core/src/arithm.cpp
      	modules/features2d/src/features2d_init.cpp
      	modules/gpu/include/opencv2/gpu/gpu.hpp
      	modules/gpu/perf/perf_imgproc.cpp
      	modules/imgproc/src/generalized_hough.cpp
      	modules/ocl/include/opencv2/ocl/ocl.hpp
      	modules/video/src/tvl1flow.cpp
      	modules/video/src/video_init.cpp
      fee2ed37
  2. 13 Jan, 2014 5 commits
  3. 11 Jan, 2014 3 commits
  4. 10 Jan, 2014 12 commits
  5. 09 Jan, 2014 19 commits