Alexander Mordvintesv
7db1f711f6
Merge branch 'master' of code.opencv.org:opencv
Conflicts: samples/python2/common.py samples/python2/feature_homography.py samples/python2/plane_ar.py samples/python2/plane_tracker.py
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
Description
Languages
C++
83.4%
Cuda
5.9%
C
3.8%
Java
2.4%
CMake
2.2%
Other
2.1%