Merge branch 'refs/heads/t/ff'

[paraslash.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b5b5befa1693fd8678fa6ba10a1bb37495019467..10d2572d926ab11ec8de95fa32649aa00f4bf1c6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-objects
+build
 foo*
 bar*
 para_*
@@ -14,15 +14,14 @@ config.log
 config.status
 Makefile
 TODO
-*_command_list.h
-*_command_list.man
-paraslash-git.tar.bz2
-skencil/overview.pdf
+paraslash-*.tar.bz2
+paraslash-*.tar.xz
+web/dia/overview.pdf
 *.swp
-error2.h
+*.rej
+*~
 web_sync
 confdefs.h
 conftest
 conftest.c
 git-version.h
-*_completion.h