Roman Donchenko 920fd48228 Merge remote-tracking branch 'origin/master' into merge-2.4 ...

Conflicts:
	modules/ocl/src/arithm.cpp

2013-11-26 15:32:44 +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 remote-tracking branch 'origin/master' into merge-2.4

2013-11-26 15:32:44 +04:00

perf

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-09-02 19:44:51 +04:00

src

Merge remote-tracking branch 'origin/master' into merge-2.4

2013-11-26 15:32:44 +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