Vadim Pisarevsky 9fa505027a Merge pull request #10263 from mshabunin:embedded-build		2017-12-11 12:42:45 +00: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 #10263 from mshabunin:embedded-build	2017-12-11 12:42:45 +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 #10263 from mshabunin:embedded-build	2017-12-11 12:42:45 +00:00
test	Merge pull request #10231 from alalek:ocl_refactor_program_api	2017-12-11 12:34:22 +00:00
CMakeLists.txt	Merge pull request #9466 from huningxin:js	2017-09-25 16:52:07 +03:00