diff options
author | Sergey Karayev <sergeykarayev@gmail.com> | 2014-07-12 09:25:23 -0700 |
---|---|---|
committer | Sergey Karayev <sergeykarayev@gmail.com> | 2014-07-12 09:25:23 -0700 |
commit | 9c61462cac1cea0856d180bc024e9937f357b274 (patch) | |
tree | 4a9fdd254d329ff8e4b653405c04a70015b8a6f2 /.gitignore | |
parent | e07a2c0eea903e8d7c7050e14d177bbd0f8f611a (diff) | |
parent | dd292da2485570488dc65464c8a9336bfc5906b3 (diff) | |
download | caffeonacl-9c61462cac1cea0856d180bc024e9937f357b274.tar.gz caffeonacl-9c61462cac1cea0856d180bc024e9937f357b274.tar.bz2 caffeonacl-9c61462cac1cea0856d180bc024e9937f357b274.zip |
back-merging [docs] changes and web demo [example] addition; updating
net_surgery example to new format
Conflicts:
docs/getting_pretrained_models.md
docs/index.md
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -55,6 +55,7 @@ examples/* # Generated documentation docs/_site +docs/gathered _site # Sublime Text settings |