Merge branch 'master' into ticket

[stg.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3c457427da73dd397220d20c878b6b0334e9dee4..0b882f23e0fa4c5019174f70b0d80db752672eb5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,28 @@
 *.[ao]
 *.[ao]

+*.d

 *.so
 *.swp
 *.so
 *.swp

+*.log

 *.diff
 *.patch
 *.diff
 *.patch

+*.vp*

 CVS*
 make_tarball.sh
 CVS*
 make_tarball.sh

+deps
+projects/rscriptd/On*
+projects/stargazer/On*
+projects/stargazer/stargazer.conf
+projects/stargazer/stargazer
+projects/stargazer/rules
+projects/stargazer/subnets
+projects/stargazer/conf.d
+projects/stargazer/var
+stglibs/smtp.lib
+stglibs/crypto.lib/blowfish.c
+Makefile.conf
+projects/convertor/convertor
+projects/rscriptd/rscriptd
+projects/sgconf/sgconf
+projects/sgconf_xml/sgconf_xml
+doc/xmlrpc-doc/book
+doc/help/book