Merge pull request #3265 from BKNio:putText_develop
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 11 Oct 2014 18:06:25 +0000 (18:06 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 11 Oct 2014 18:06:25 +0000 (18:06 +0000)
1  2 
modules/core/src/drawing.cpp

Simple merge