Andrey Pavlenko 2431c72d1d Merge pull request #2000 from apavlenko:license_copyright

2013-12-18 19:35:04 +04:00

..

doc

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-16 15:02:12 +04:00

include/opencv2

Merge pull request #2000 from apavlenko:license_copyright

2013-12-18 19:35:04 +04:00

perf

Merge pull request #1954 from pentschev:ocl_features2d_fast_master

2013-12-12 17:37:09 +04:00

src

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-16 15:02:12 +04:00

test

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-16 15:02:12 +04:00

CMakeLists.txt

ocl: add support for initialization from user-provided OpenCL handles

2013-12-12 19:59:22 +04:00