Merge branch 'master' of github.com:Yangqing/caffe
-rw-r--r-- 238 .gitignore
-rw-r--r-- 96 README.md
drwxr-xr-x - src