Alexander Alekhin 2c6f1ab57d Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-11-06 20:04:31 +00:00

..

doc/pics

squashed #823

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

include/opencv2

docs: remove NULL strings from highgui.hpp

2018-11-04 12:59:35 +01:00

misc/java

java: disable highgui wrapped code

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

src

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

2018-11-06 20:04:31 +00:00

test

Merge pull request #11897 from Jakub-Golinowski:hpx_backend

2018-08-31 16:23:26 +03:00

CMakeLists.txt

update CMakeList.txt

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