Merge branch 'master' into next

[paraslash.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6ca2a8546efdfd005873a31e4ed5bf220a7c0b48..a23f234f978061dc07fba413a178549f68cc164d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,9 @@ paraslash-git.tar.bz2
 skencil/overview.pdf
 web/sync
 *.swp
+error2.h
+web_sync
+confdefs.h
+conftest
+conftest.c
+