Merge branch 'master' into next

[paraslash.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0000ba4195ab09f3dc782eeb87b9eabf106d02d9..d3a1fc5e94aa4cba84113021557b0a1b882a4f93 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*.[oa]
+objects
 foo*
 bar*
 para_*
@@ -30,4 +30,4 @@ web_sync
 confdefs.h
 conftest
 conftest.c
-
+GIT-VERSION-FILE