X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=.gitignore;h=2889d20d852cf91b01aa442021562718e496f031;hp=6df2e505aba059b933bad7056e4cc12f1a303207;hb=0b6e7a20c19d642f9d8e65683e1525c91dd3de39;hpb=2cbca80137dd7b4229ba984080ac5410da546c71

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