Alexander Alekhin 4e8f8922e2 Merge pull request #7170 from alalek:fix_build

2016-08-29 10:15:58 +00:00

..

doc

migration: github.com/opencv/opencv

2016-07-12 12:51:12 +03:00

include/opencv2

Merge pull request #7158 from sturkmen72:documentation_fix

2016-08-26 11:40:19 +00: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

Add JSON support.

2016-08-11 00:53:15 +08:00

src

Merge pull request #7170 from alalek:fix_build

2016-08-29 10:15:58 +00:00

test

Merge pull request #7088 from wiryls:FileStorageJSON

2016-08-24 16:49:06 +00:00

CMakeLists.txt

cmake: minimize MSVS projects layout

2016-08-26 13:40:16 +03:00