summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-16 10:37:38 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-16 10:37:38 -0300
commit06eebf54ab572ebaf6730f2095a062cd9549f12e (patch)
tree35c66cbeae132418dfbfc1524b36b55482080dcb /.gitignore
parentdf5dfdb2d8dd407ed9ed0d2b043e0da299b9c341 (diff)
parent1069e7b9470fb63f70a43fa72407fcd4276d550d (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/bug_4963_fix-bulky-fetch' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 0512b87..3a80621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ lib/
local/
share/
MANIFEST
+twistd.pid