author | naxingyu <asr.naxingyu@gmail.com> | |
Sat, 22 Aug 2015 03:46:02 +0000 (11:46 +0800) | ||
committer | naxingyu <asr.naxingyu@gmail.com> | |
Sat, 22 Aug 2015 03:46:02 +0000 (11:46 +0800) | ||
commit | 2042416421e230debd45ffde55c3cceaa9dfda4c | |
tree | 9123d87af87df038d6b5c7ff4f3254136233e438 | tree | snapshot (tar.xz tar.gz zip) |
parent | a75d2af933af325a0072d045e0adc30578560c73 | commit | diff |
parent | b53fad02ff90a5b38a70f092840d211676ff527e | commit | diff |
resolving conflicts
src/nnet/nnet-convolutional-component.h | diff1 | | diff2 | | blob | history |