Merge pull request #5386 from StevenPuttemans:add_markers
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 2 Nov 2015 15:45:38 +0000 (15:45 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 2 Nov 2015 15:45:38 +0000 (15:45 +0000)
1  2 
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/drawing.cpp

Simple merge