Merge branch 'master' into next

[paraslash.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 18c71cf..a23f234 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,7 @@ web/sync
 *.swp
 error2.h
 web_sync
+confdefs.h
+conftest
+conftest.c
+