summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e358b18b78..7e77c9d022 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
*~
git-subtree.xml
git-subtree.1
+mainline
+subproj