Merge remote-tracking branch 'quiris/master' into quiris

[librarian.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100644 (file)
new mode 100755 (executable)
index f72688b..b6c0f8a
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
 .DS_Store
 *.pyc
 .DS_Store
 *.pyc

+*~

 MANIFEST
 dist
 build
 *.egg-info
 .coverage
 MANIFEST
 dist
 build
 *.egg-info
 .coverage

+.project
+.pydevproject
+.settings