Vadim Pisarevsky 7b701fee60 Merge pull request #10302 from alalek:issue_10254		2017-12-13 17:31:40 +00:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	core: fix persistence with deprecated traits	2017-12-12 17:07:36 +03:00
misc/java	core(test): refactor Java Eigenvalues/PCA tests	2017-12-12 15:07:31 +03:00
perf	Merge pull request #9753 from tomoaki0705:universalMatmul	2017-11-20 15:56:53 +03:00
src	Merge pull request #10293 from alalek:fix_persistence_with_deprecated_traits	2017-12-13 17:30:23 +00:00
test	Merge pull request #10302 from alalek:issue_10254	2017-12-13 17:31:40 +00:00
CMakeLists.txt	Merge pull request #9466 from huningxin:js	2017-09-25 16:52:07 +03:00