1. 11 Nov, 2013 2 commits
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 4f1aed98
      Roman Donchenko authored
      Conflicts:
      	.gitignore
      	modules/contrib/src/detection_based_tracker.cpp
      	modules/core/include/opencv2/core/core.hpp
      	modules/core/include/opencv2/core/internal.hpp
      	modules/core/src/gpumat.cpp
      	modules/core/src/opengl.cpp
      	modules/gpu/src/cuda/safe_call.hpp
      	modules/highgui/src/cap.cpp
      	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
      	modules/ocl/doc/image_processing.rst
      	modules/ocl/include/opencv2/ocl/ocl.hpp
      	modules/ocl/perf/perf_haar.cpp
      	modules/ocl/src/haar.cpp
      	modules/ocl/src/imgproc.cpp
      	modules/ocl/src/kmeans.cpp
      	modules/ocl/src/svm.cpp
      	modules/ocl/test/test_objdetect.cpp
      	samples/ocl/adaptive_bilateral_filter.cpp
      4f1aed98
    • Roman Donchenko's avatar
  2. 08 Nov, 2013 7 commits
  3. 07 Nov, 2013 4 commits
  4. 06 Nov, 2013 22 commits
  5. 05 Nov, 2013 5 commits