feaa12a274
Conflicts: modules/core/include/opencv2/core/version.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/initialization.cpp modules/ocl/test/main.cpp modules/superres/CMakeLists.txt modules/superres/src/input_array_utility.cpp modules/superres/src/input_array_utility.hpp modules/superres/src/optical_flow.cpp |
||
---|---|---|
3rdparty | ||
apps | ||
cmake | ||
data | ||
doc | ||
include | ||
modules | ||
platforms | ||
samples | ||
.gitattributes | ||
.gitignore | ||
CMakeLists.txt | ||
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.