Alexander Alekhin 690fb0544c Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-10-02 14:31:05 +03:00
..
doc	Misc. typos	2018-07-31 18:44:23 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-10-02 14:31:05 +03:00
misc	Generate enum bindings automatically	2018-09-28 15:39:51 +09: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-10-02 14:31:05 +03:00
test	Merge pull request #12310 from cv3d:chunks/enum_interface	2018-09-21 18:12:35 +03:00
CMakeLists.txt	JavaScript bindings for features2d module	2018-09-28 11:04:13 +03:00