Alexander Alekhin 0f298a4203 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-05-28 11:22:55 +00:00

..

doc/pics

squashed #823

2015-04-24 21:58:14 +02:00

include/opencv2

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

2018-05-28 11:22:55 +00:00

misc/java

java: disable highgui wrapped code

2018-01-13 02:12:39 +00:00

src

core: drop cv::errorNoReturn()

2018-04-25 15:07:18 +03:00

test

ts: refactor OpenCV tests

2018-02-03 19:39:47 +00:00

CMakeLists.txt

update CMakeList.txt

2018-02-05 16:23:52 +03:00