X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=.gitignore;h=2889d20d852cf91b01aa442021562718e496f031;hp=6df2e505aba059b933bad7056e4cc12f1a303207;hb=9cc91f2d8d746e77947eeb2fd7af711a43c3a56a;hpb=32a81d7eecfa5c8585d7095631ff2cd8b7b1bf7a

diff --git a/.gitignore b/.gitignore
index 6df2e505..2889d20d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ TODO
 paraslash-*.tar.bz2
 web/dia/overview.pdf
 *.swp
+*.rej
+*~
 error2.h
 web_sync
 confdefs.h