aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2015-06-25 19:56:11 +0800
committerDeterminant <[email protected]>2015-06-25 19:56:11 +0800
commit555f7f2e8d0578a1228cd736a35f80ba5a891817 (patch)
tree847fd57fa2ffb4322a235ebb5fc6d9c1cf94191f
parent075fb626954da90db887cdb85bbf265b0626ddc9 (diff)
parent46b82759d3904b08a615cf9902d053db3b4b6981 (diff)
Merge branch 'master' of github.com:Determinant/nerv
Conflicts: nerv/doc/Makefile nerv/doc/source/conf.py nerv/doc/source/index.rst
-rw-r--r--nerv/doc/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/nerv/doc/.gitignore b/nerv/doc/.gitignore
new file mode 100644
index 0000000..378eac2
--- /dev/null
+++ b/nerv/doc/.gitignore
@@ -0,0 +1 @@
+build