Alexander Alekhin 1dee705074 Merge branch '3.4' into merge-3.4		2018-12-22 05:40:15 +00:00
..
doc	Misc. typos	2018-07-31 18:44:23 +03:00
include/opencv2	Fixed -Wextra-semi warnings in public headers	2018-12-11 14:45:27 -05:00
misc	Try to fix "enum struct" wrapping for Java	2018-12-19 13:16:43 +03:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge branch '3.4' into merge-3.4	2018-12-22 05:40:15 +00:00
test	Merge branch '3.4' into merge-3.4	2018-12-22 05:40:15 +00:00
CMakeLists.txt	JavaScript bindings for features2d module	2018-09-28 11:04:13 +03:00