Andrey Pavlenko 736097a462 Merge pull request #1868 from KonstantinMatskevich:umat_bugfix		2013-11-26 23:24:51 +04:00
..
doc	hopefully, fixed compile errors on Win & Linux; fixed getMatVector() so core & imgproc tests now pass; fixed doc builder errors	2013-10-22 17:41:28 +04:00
include/opencv2	Merge pull request #1835 from SpecLad:windows-xadd	2013-11-26 11:43:34 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-02 19:44:51 +04:00
src	Merge pull request #1868 from KonstantinMatskevich:umat_bugfix	2013-11-26 23:24:51 +04:00
test	ocl: disable tests	2013-11-23 18:13:32 +04:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/2.4' into merge-2.4	2013-10-15 20:08:52 +04:00