Alexander Alekhin 7722a2b8a8 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-06-04 17:58:34 +00:00

..

src/cpp

bindings: basic support for #if preprocessor directives

2019-12-04 18:42:31 +03:00

test

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-06-04 17:58:34 +00:00

filelist

features2d: remove deprecated java wrappers

2018-05-16 16:13:18 +02:00

filelist_common

java: integrate code from base modules

2016-10-12 18:01:51 +03:00

gen_dict.json

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-06-07 19:02:55 +03:00