Merge branch 'master' into ticket

[stg.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d231c0d5df68d2c03d7db9ba77d2603a7c7270d1..0b882f23e0fa4c5019174f70b0d80db752672eb5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
 *.[ao]
 *.[ao]

+*.d

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

+*.log

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

+*.vp*

 CVS*
 make_tarball.sh
 deps
 CVS*
 make_tarball.sh
 deps


@@ -17,3 +20,9 @@ projects/stargazer/var
 stglibs/smtp.lib
 stglibs/crypto.lib/blowfish.c
 Makefile.conf
 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