Merge pull request #1473 from longjon/pytest
-rw-r--r-- 101863 .Doxyfile
-rw-r--r-- 1058 .gitignore
-rw-r--r-- 1396 .travis.yml
-rw-r--r-- 5100 CMakeLists.txt
drwxr-xr-x - CMakeScripts
-rw-r--r-- 620 CONTRIBUTORS.md
-rw-r--r-- 197 INSTALL.md
-rw-r--r-- 2083 LICENSE
-rw-r--r-- 20510 Makefile
-rw-r--r-- 2874 Makefile.config.example
-rw-r--r-- 347 README.md
-rw-r--r-- 1180 caffe.cloc
drwxr-xr-x - data
drwxr-xr-x - docs
drwxr-xr-x - examples
drwxr-xr-x - include
drwxr-xr-x - matlab
drwxr-xr-x - models
drwxr-xr-x - python
drwxr-xr-x - scripts
drwxr-xr-x - src
drwxr-xr-x - tools