Vadim Pisarevsky 5ce38e516e Merge pull request #10223 from vpisarev:ocl_mac_fixes ... * fixed OpenCL functions on Mac, so that the tests pass * fixed compile warnings; temporarily disabled OCL branch of TV L1 optical flow on mac * fixed other few warnings on macos		2017-12-05 13:32:28 +03:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	Merge pull request #10190 from seiko2plus:issue10189	2017-11-30 07:16:12 +00:00
misc/java	Merge pull request #10050 from floe/android-studio-3.3.1	2017-11-10 19:35:32 +00:00
perf	Merge pull request #9753 from tomoaki0705:universalMatmul	2017-11-20 15:56:53 +03:00
src	Merge pull request #10223 from vpisarev:ocl_mac_fixes	2017-12-05 13:32:28 +03:00
test	core:ppc Fixed compilation with xlc, clang.	2017-11-29 07:48:26 +00:00
CMakeLists.txt	Merge pull request #9466 from huningxin:js	2017-09-25 16:52:07 +03:00