Alexander Alekhin 9787ab598b Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-07-24 22:48:54 +03:00

..

doc/pics

Removed Sphinx documentation files

2014-12-26 19:12:19 +03:00

include/opencv2

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

2018-07-17 19:27:48 +03:00

misc/java/test

Modified java wrapping mechanism

2015-03-02 18:12:30 +03:00

perf

next: drop CV_CXX11 conditions

2018-04-10 18:09:54 +03:00

src

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

2018-07-17 19:27:48 +03:00

test

objdetect(qr): update test code

2018-07-24 13:56:55 +03:00

CMakeLists.txt

Merge pull request #9466 from huningxin:js

2017-09-25 16:52:07 +03:00