Alexander Alekhin 45dd575ed2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 ... Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch" This reverts commit 9ba9358ecb. Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)" This reverts commit f185802489.		2018-06-04 19:26:10 +03:00
..
doc	Rewite polar transforms (#11323)	2018-04-17 15:50:52 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
misc/java	Misc. modules/ cont. pt2	2018-02-13 11:28:11 -05:00
perf	Merge pull request #11108 from take1014:hough_4303	2018-05-23 20:42:12 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
CMakeLists.txt	Merge pull request #9466 from huningxin:js	2017-09-25 16:52:07 +03:00