Gregory Morse bcf78daed2 Update CMakeLists.txt ...

WinRT parallels library is causing conflicts in VC++ due to inconsistent usage with C++/CX which is now present in parallels.cpp.  This support should be included in all projects with WinRT specific code except if doing special native C++ tasks.

2015-12-09 03:45:10 +01: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 pull request #5660 from jet47:cuda-wrap-stream-3.0

2015-12-08 12:28:57 +00:00

misc/java

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

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

Merge pull request #5230 from PhilLab:patch-4

2015-12-08 18:46:34 +00:00

test

Merge pull request #5651 from hoangviet1985:fix_solvePoly_3.0.0

2015-12-07 10:12:54 +00:00

CMakeLists.txt

Update CMakeLists.txt

2015-12-09 03:45:10 +01:00