Open Source Computer Vision Library
Go to file
Roman Donchenko c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
3rdparty Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-08 18:47:38 +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-07-03 19:53:21 +04:00
data
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-08 18:47:38 +04:00
include
modules Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-08 18:47:38 +04:00
platforms Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-08 18:47:38 +04:00
samples Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-08 18:47:38 +04:00
.gitattributes
.gitignore
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
index.rst
README

OpenCV: open source computer vision library

Homepage:    http://opencv.org
Online docs: http://docs.opencv.org
Q&A forum:   http://answers.opencv.org
Dev zone:    http://code.opencv.org

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.