Merge branch 'master' into dane

[users/heiko/exim.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b1ed98f07fd4cc76b400e24eaddc9ebded361258..478c603cc9213ca5013b025779103fa86c41ff38 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ exim-packaging-*
 *.bak
 .*.swp
 0*.patch
+*.orig
+*.rej
+.gdb_history