parent: 956cfcae | patch | commit | show whitespace
Joseph Redmon
2014-02-24 15e86996d62e90bbd474040ac70b510bf3842ae7 
Merge branch 'master' of pjreddie.com:jnet

Conflicts:
	cfg/voc_imagenet.cfg
changed files