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

[stg.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9d6170c93666e47157c00491362cb7c684c9b5fa..b49a31e25c4f53948fc1e7db475c8785e6b4b491 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.[ao]
 *.[ao]

-#*.d
+*.d

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


@@ -23,5 +23,7 @@ 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/help/book
 doc/xmlrpc-doc/book
 doc/help/book

+doc/help/help.pdf