Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / .gitignore

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

-#*.d
+*.d

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


@@ -23,4 +23,6 @@ Makefile.conf
 projects/convertor/convertor
 projects/rscriptd/rscriptd
 projects/sgconf/sgconf
 projects/convertor/convertor
 projects/rscriptd/rscriptd
 projects/sgconf/sgconf

+projects/sgconf_xml/sgconf_xml

 doc/xmlrpc-doc/book
 doc/xmlrpc-doc/book

+doc/help/book