Alexander Alekhin a871f9e4f7 Merge branch 'update_version' into release		2017-10-23 18:41:12 +03:00
..
include/opencv2	Merge branch 'update_version' into release	2017-10-23 18:41:12 +03:00
misc	Merge pull request #9853 from catree:fix_dnn_samples_python3	2017-10-16 16:18:22 +00:00
perf	Merge pull request #9114 from pengli:dnn_rebase	2017-10-02 15:38:00 +03:00
src	ocl: simplify ocl::Timer interface	2017-10-18 16:01:21 +03:00
test	Binary data for batch normalization test from Torch	2017-10-20 12:01:42 +03:00
CMakeLists.txt	Merge pull request #9114 from pengli:dnn_rebase	2017-10-02 15:38:00 +03:00