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)
commit2a42960ff2bf2cb23d744851e78e03bd568852bd
treedb50407f0cbabbba427680c8707d6c6636976d7c
parentaabb40e34df8f897b069c2473b92dff161ba6514
parentad0bfdfb25f379fa269e557c1c8565f1d10ba992
Merge branch 'master' of https://github.com/nevion/opencv into cc
modules/imgproc/include/opencv2/imgproc/imgproc.hpp