Alexander Alekhin afdbd855ee Merge pull request #5843 from jia-kai:disable-dlopen-opencl

2015-12-21 15:47:15 +00:00

..

doc

Added example to the documentation for the NormTypes enum (L1, L2, INF)

2015-10-15 19:16:07 +02:00

include/opencv2

Merge tag '3.1.0'

2015-12-21 14:24:46 +03:00

misc/java

Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770)

2015-05-19 13:30:18 +03:00

perf

UMat: add perf test for custom ptr

2015-09-03 10:48:07 +03:00

src

define g_haveOpenCL only when HAVE_OPENCL is set

2015-12-21 16:42:38 +08:00

test

HAL moved back to core

2015-12-17 12:33:23 +03:00

CMakeLists.txt

HAL moved back to core

2015-12-17 12:33:23 +03:00