1. 13 Sep, 2013 1 commit
  2. 06 Sep, 2013 2 commits
  3. 03 Sep, 2013 1 commit
  4. 02 Sep, 2013 5 commits
  5. 01 Sep, 2013 1 commit
  6. 30 Aug, 2013 6 commits
  7. 29 Aug, 2013 8 commits
  8. 28 Aug, 2013 15 commits
  9. 27 Aug, 2013 1 commit
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 2d6f35d6
      Roman Donchenko authored
      Conflicts:
      	modules/gpuwarping/src/cuda/resize.cu
      	modules/gpuwarping/src/resize.cpp
      	modules/gpuwarping/test/test_resize.cpp
      	modules/ocl/perf/main.cpp
      	modules/ocl/perf/perf_calib3d.cpp
      	modules/ocl/perf/perf_canny.cpp
      	modules/ocl/perf/perf_color.cpp
      	modules/ocl/perf/perf_haar.cpp
      	modules/ocl/perf/perf_match_template.cpp
      	modules/ocl/perf/perf_precomp.cpp
      	modules/ocl/perf/perf_precomp.hpp
      2d6f35d6