Vitaliy Lyudvichenko 8e68d837de Merge branch 'object_detection_sample_ssd' into dnn* ...

# Conflicts:
#	modules/dnn/include/opencv2/dnn/blob.hpp
#	modules/dnn/src/init.cpp
#	modules/dnn/src/layers/concat_layer.cpp
#	modules/dnn/src/layers/convolution_layer.cpp
#	modules/dnn/src/layers/convolution_layer.hpp
#	modules/dnn/src/layers/layers_common.cpp
#	modules/dnn/src/layers/layers_common.hpp
#	modules/dnn/src/layers/op_im2col.hpp
#	modules/dnn/src/layers/pooling_layer.cpp
#	modules/dnn/src/layers/pooling_layer.hpp

2016-08-18 00:41:26 +03:00

..

dnn

Merge branch 'object_detection_sample_ssd' into dnn*

2016-08-18 00:41:26 +03:00

dnn.hpp

GSOC 2015: dnn module

2015-09-04 15:26:38 +03:00