Vadim Pisarevsky 7fea7e0629 Merge pull request #6697 from wiryls:FileStorageBase64

2016-06-30 17:17:03 +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 pull request #6697 from wiryls:FileStorageBase64

2016-06-30 17:17:03 +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

Merge pull request #6581 from mshabunin:hal_mag

2016-06-21 13:16:17 +00:00

src

Merge pull request #6697 from wiryls:FileStorageBase64

2016-06-30 17:17:03 +00:00

test

Merge pull request #6697 from wiryls:FileStorageBase64

2016-06-30 17:17:03 +00:00

CMakeLists.txt

cmake: fix HAL dependencies for core module

2016-06-21 19:50:32 +03:00