summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPatrick Totzke <patricktotzke@gmail.com>2012-01-11 14:41:31 +0000
committerPatrick Totzke <patricktotzke@gmail.com>2012-01-11 14:41:31 +0000
commitdf22d80039908aafdae149a576af93d4ede60a6a (patch)
tree87a075ea596ffdfc8977ab81553b9d9f1fa3d50a /.gitignore
parentcdc99fce94c0319d203a5686c375789f7e22d80f (diff)
parentd4fd21a8d9eeb42137f596c6b76ad31cc250e8a5 (diff)
Merge branch 'docs' into testing
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3b5060ea..c1a2bb8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
/MANIFEST
.gdb_history
docs/_build/
+docs/user/build
/alot/VERSION