Code

fix the compile error#305

Code

Merged

nihui merged 5 commits intoTencent:masterTencent/ncnn:masterfrom BUG1989:masterCopy head branch name to clipboardMar 26, 2018

+1-1

Commits

Commits on Dec 25, 2017

• Merge pull request #1 from Tencent/master

  Show description for 8fc5e33
  BUG1989

  authored
  8fc5e33

  Copy full SHA for 8fc5e33

Commits on Dec 29, 2017

• Merge pull request #2 from Tencent/master

  Show description for eca6fe4
  BUG1989

  authored
  eca6fe4

  Copy full SHA for eca6fe4

Commits on Feb 17, 2018

• Merge pull request #3 from Tencent/master

  Show description for c2876d8
  BUG1989

  authored
  c2876d8

  Copy full SHA for c2876d8

Commits on Mar 26, 2018

• Merge pull request #4 from Tencent/master

  Show description for c9dd4e1
  BUG1989

  authored
  c9dd4e1

  Copy full SHA for c9dd4e1

• Update convolution_3x3.h

  Show description for bf5443c
  BUG1989

  authored
  bf5443c

  Copy full SHA for bf5443c