Alexander Alekhin 8c0b0714e7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-03-11 19:20:22 +00:00

..

doc

Merge pull request #13104 from alalek:docs_fix_bib_Kroeger2016

2018-11-10 20:11:28 +03:00

include/opencv2

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

2019-02-26 17:34:42 +03:00

misc/java

related moved enums

2018-08-27 00:43:04 +03:00

perf

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

2019-03-11 19:20:22 +00:00

src

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

2019-02-26 17:34:42 +03:00

test

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

2019-02-26 17:34:42 +03:00

CMakeLists.txt

build: fix js build (make video->calib3d dependency optional)

2018-08-31 14:29:25 +03:00