Merge branch 'refs/heads/t/ff'

[paraslash.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b9190f286953b5f6e9b28d205d0d3c5f85ffb822..10d2572d926ab11ec8de95fa32649aa00f4bf1c6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,12 @@ config.log
 config.status
 Makefile
 TODO
-paraslash-git.tar.bz2
+paraslash-*.tar.bz2
+paraslash-*.tar.xz
 web/dia/overview.pdf
 *.swp
-error2.h
+*.rej
+*~
 web_sync
 confdefs.h
 conftest