Merge branch 'refs/heads/t/para_play'

[paraslash.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6df2e505aba059b933bad7056e4cc12f1a303207..bd5e04801c4bec2714dd515810296f1bc89cbab0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,9 +15,10 @@ config.status
 Makefile
 TODO
 paraslash-*.tar.bz2
-web/dia/overview.pdf
+paraslash-*.tar.xz
 *.swp
-error2.h
+*.rej
+*~
 web_sync
 confdefs.h
 conftest