Alexander Alekhin 7fa7fa0226 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-11-21 08:33:39 +00:00
..
doc	Misc. typos	2018-07-31 18:44:23 +03:00
include/opencv2	Fixed pendantic warnings	2018-11-07 11:23:21 -05:00
misc	move legacy C-API constants into separate files	2018-11-17 23:47:51 +00:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-11-21 08:33:39 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-11-17 14:17:35 +00:00
CMakeLists.txt	JavaScript bindings for features2d module	2018-09-28 11:04:13 +03:00