parent: 076009 | patch | commitdiff
Joseph Redmon
2014-07-17 b32a287e38f4c6a41828f18b4669dec9f3af4943
refs
author Joseph Redmon <pjreddie@gmail.com>
Thursday, July 17, 2014 17:17 +0000
committer Joseph Redmon <pjreddie@gmail.com>
Thursday, July 17, 2014 17:17 +0000
commitb32a287e38f4c6a41828f18b4669dec9f3af4943
tree 114e36e01288de6a51dc8cf6ab3d3da3b03e485f tree | zip | gz | tar | bzip2 | xz
parent 076009ebe308fde0156304e701f36e8bb04e4d6b view | diff
0c2cf402aff1b6eef47e8bdfae77472589c42e0c view | diff 
Merge branch 'master' of pjreddie.com:jnet

Conflicts:
	src/cnn.c
3 files modified
8 ■■■■■ changed files
src/cnn.c 6 ●●●●● diff | view | raw | blame | history
src/data.c 1 ●●●●● diff | view | raw | blame | history
src/image.c 1 ●●●●● diff | view | raw | blame | history