Roman Donchenko 9ca80961fd Merge pull request #1874 from SpecLad:merge-2.4		2013-11-28 16:43:00 +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 #1874 from SpecLad:merge-2.4	2013-11-28 16:43:00 +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 #1874 from SpecLad:merge-2.4	2013-11-28 16:43:00 +04:00
test	fixed ocl_arithm_op; fix for 3-channel images is needed	2013-11-25 14:21:12 +04:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/2.4' into merge-2.4	2013-10-15 20:08:52 +04:00