Alexander Alekhin 808ba552c5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-09-14 23:44:35 +00:00
..
doc	Merge pull request #12147 from D-Alex:master	2018-09-13 15:43:04 +03:00
include/opencv2	Merge pull request #12147 from D-Alex:master	2018-09-13 15:43:04 +03:00
misc/java	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-07-17 19:27:48 +03:00
perf	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-09-07 12:40:27 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-09-14 23:44:35 +00:00
test	Merge pull request #12147 from D-Alex:master	2018-09-13 15:43:04 +03:00
CMakeLists.txt	Merge pull request #12147 from D-Alex:master	2018-09-13 15:43:04 +03:00