• Vitaliy Lyudvichenko's avatar
    Merge branch 'object_detection_sample_ssd' into dnn* · 8e68d837
    Vitaliy Lyudvichenko authored
    # 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
    8e68d837
Name
Last commit
Last update
..
caffe Loading commit data...
layers Loading commit data...
opencl Loading commit data...
torch Loading commit data...
blob.cpp Loading commit data...
dnn.cpp Loading commit data...
init.cpp Loading commit data...
precomp.hpp Loading commit data...