Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 8 Jul 2013 14:47:38 +0000 (18:47 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 8 Jul 2013 14:47:38 +0000 (18:47 +0400)
commitc05bfe9d6d73fae5181218b881d64b5c2f268785
treecdd4cf6db74d792ca21a47090b723e8266fc2866
parentde58039b46abd08ed15fdc1445d34b311f10a966
parent1a2458885ba5e1f08e08caf9d9fc8ce77bd11bb4
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
modules/features2d/include/opencv2/features2d.hpp
modules/highgui/src/cap_qtkit.mm
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp