summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSergey Karayev <sergeykarayev@gmail.com>2014-07-12 09:25:23 -0700
committerSergey Karayev <sergeykarayev@gmail.com>2014-07-12 09:25:23 -0700
commit9c61462cac1cea0856d180bc024e9937f357b274 (patch)
tree4a9fdd254d329ff8e4b653405c04a70015b8a6f2 /.gitignore
parente07a2c0eea903e8d7c7050e14d177bbd0f8f611a (diff)
parentdd292da2485570488dc65464c8a9336bfc5906b3 (diff)
downloadcaffeonacl-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--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 29271666..7a10d94b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@ examples/*
# Generated documentation
docs/_site
+docs/gathered
_site
# Sublime Text settings