Merge branch 'master' of pjreddie.com:jnet

Conflicts:
	cfg/voc_imagenet.cfg
This commit is contained in:
Joseph Redmon 2014-02-24 13:04:11 -08:00
commit 15e86996d6

Diff Content Not Available