Roman Donchenko ccbd7f8da9 Added a citation which used to be in the gpu module in 2.4.

2013-11-11 18:00:55 +04:00

..

doc

Added a citation which used to be in the gpu module in 2.4.

2013-11-11 18:00:55 +04:00

include/opencv2

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

2013-11-11 16:55:36 +04:00

perf

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

2013-11-11 16:55:36 +04:00

src

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

2013-11-11 16:55:36 +04:00

test

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

2013-11-11 16:55:36 +04:00

CMakeLists.txt

ocl: force to use Khronos OpenCL headers

2013-10-18 15:47:11 +04:00