Merge pull request #3039 from alalek:ocv_world
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 6 Aug 2014 14:52:52 +0000 (14:52 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 6 Aug 2014 14:52:52 +0000 (14:52 +0000)
commitca183707f23c5f88e7aeb1d4e54f5925d19c19ae
treed47e08630fbc7cf6163a2808a82d135e85ce2144
parentbab5700a09661195f42d79d258cda324ed7ba955
parentfc0f254f0042dd94419bdc07358a7fd38577b359
Merge pull request #3039 from alalek:ocv_world
modules/core/src/convert.cpp
modules/imgproc/src/templmatch.cpp