Merge pull request #225 from david415/2438.magic-folder-stable.8

[tahoe-lafs/tahoe-lafs.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9f1572c0ddb0b437608c9a55991a8c0a55644b1c..42dc42df15893820765daf95341d7aeb4f7e1c12 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.pyc
 *.pyo
 *~
+*.DS_Store
+.*.kate-swp
 
 /build/
 /support/
@@ -17,11 +19,13 @@
 /.built
 /src/allmydata_tahoe.egg-info/
 Twisted-*.egg
+zope.interface-*.egg
+.pc
 
 /_trial_temp*
 /tmp*
+/*.patch
 /dist/
-/twisted/plugins/dropin.cache
 /tahoe-deps/
 /tahoe-deps.tar.gz
 /.coverage
@@ -29,3 +33,4 @@ Twisted-*.egg
 /coverage-html/
 /miscaptures.txt
 /violations.txt
+/smoke_magicfolder/