Alexander Alekhin 7e2ebecd52 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-01-10 12:29:41 +03:00
..
calib3d
core	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-01-10 12:29:41 +03:00
dnn	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-01-10 12:29:41 +03:00
features2d	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-12-27 18:15:50 +03:00
flann
gapi	fix size	2018-12-19 17:45:00 +03:00
highgui	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-12-27 18:15:50 +03:00
imgcodecs
imgproc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-01-10 12:29:41 +03:00
java	Merge branch '3.4' into merge-3.4	2018-12-22 05:40:15 +00:00
js	js: allow building with basic aruco functionality	2019-01-03 19:04:00 +01:00
ml
objdetect	Merge branch '3.4' into merge-3.4	2018-12-22 05:40:15 +00:00
photo
python	release: OpenCV 4.0.1 (version++)	2018-12-22 07:03:30 +00:00
stitching	Merge pull request #13584 from qchateau:improve_stitching_detailed	2019-01-09 17:01:07 +03:00
ts
video	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
videoio	Fixed standalone FFmpeg search with pkg-config	2018-12-27 14:40:44 +03:00
world	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
CMakeLists.txt