3939d78336
Conflicts: modules/core/include/opencv2/core/types_c.h modules/gpu/src/cuda/imgproc.cu modules/gpu/src/cuda/safe_call.hpp modules/gpu/src/error.cpp modules/gpu/src/imgproc.cpp modules/imgproc/src/distransform.cpp modules/imgproc/src/shapedescr.cpp modules/python/src2/cv2.cpp modules/python/src2/cv2.cv.hpp
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.