Merge branch 'refs/heads/t/invalid-ids'

[paraslash.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index dc3b14ac27151730db5a1d34effb94328ab3ca81..2889d20d852cf91b01aa442021562718e496f031 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
-objects
+build
 foo*
 bar*
 para_*
-*.cmdline.[ch]
 GPATH
 GRTAGS
 GSYMS
@@ -14,19 +13,15 @@ config.h.in
 config.log
 config.status
 Makefile
-Makefile.deps
 TODO
-NONE
-aclocal.m4
-*_command_list.h
-*_command_list.man
-paraslash-git.tar.bz2
-skencil/overview.pdf
-web/sync
+paraslash-*.tar.bz2
+web/dia/overview.pdf
 *.swp
+*.rej
+*~
 error2.h
 web_sync
 confdefs.h
 conftest
 conftest.c
-
+git-version.h