Open Source Computer Vision Library
Go to file
Roman Donchenko 6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4
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
2013-08-13 12:56:39 +04:00
3rdparty Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
apps Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
cmake Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
data Merge release 2.4.4 2013-03-04 19:43:49 +04:00
doc Fix whitespace errors. 2013-08-06 18:07:00 +04:00
include updated demos and tutorial regarding the Retina class transfer to bioinspired module. 2013-06-12 22:43:36 +02:00
modules Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
platforms Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
samples Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
.gitattributes Fix typo in .gitattributes. 2013-06-05 13:51:11 +04:00
.gitignore Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
CMakeLists.txt Removed OpenCVFindPkgConfig.cmake, since it's bundled with CMake now. 2013-08-08 12:03:41 +04:00
index.rst android -> plarforms/android 2013-05-27 11:10:38 +04:00
README.md Updated README.md 2013-07-30 18:51:53 +04:00

OpenCV: Open Source Computer Vision Library

Resources

Contributing

Please read before starting work on a pull request: http://code.opencv.org/projects/opencv/wiki/How_to_contribute

Summary of guidelines:

  • One pull request per issue;
  • Choose the right base branch;
  • Include tests and documentation;
  • Clean up "oops" commits before submitting;
  • Follow the coding style guide.

Donate OpenCV project Donate OpenCV project