1. 13 Aug, 2013 1 commit
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 6b5ac42a
      Roman Donchenko authored
      Conflicts:
      	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
      	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
      	modules/features2d/doc/object_categorization.rst
      	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
      	modules/gpu/doc/image_filtering.rst
      	modules/gpu/doc/image_processing.rst
      	modules/gpu/doc/video.rst
      	modules/imgproc/doc/miscellaneous_transformations.rst
      	modules/imgproc/doc/object_detection.rst
      	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
      	modules/imgproc/src/samplers.cpp
      	modules/ml/doc/k_nearest_neighbors.rst
      	modules/nonfree/doc/feature_detection.rst
      	modules/ocl/include/opencv2/ocl/ocl.hpp
      	modules/photo/doc/inpainting.rst
      	modules/ts/include/opencv2/ts.hpp
      	platforms/scripts/camera_build.conf
      	samples/android/camera-calibration/AndroidManifest.xml
      6b5ac42a
  2. 12 Aug, 2013 10 commits
  3. 09 Aug, 2013 4 commits
  4. 08 Aug, 2013 10 commits
  5. 07 Aug, 2013 7 commits
  6. 06 Aug, 2013 8 commits