Merge branch 'master' of https://github.com/nevion/opencv into cc
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 15 Dec 2012 17:45:55 +0000 (21:45 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 15 Dec 2012 17:45:55 +0000 (21:45 +0400)
1  2 
modules/imgproc/include/opencv2/imgproc/imgproc.hpp