Merge branch 'master' into naffanya-dev

[stg.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 991874f06fcaf7e4ba0a4acf6ba760956605c991..9d6170c93666e47157c00491362cb7c684c9b5fa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ Makefile.conf
 projects/convertor/convertor
 projects/rscriptd/rscriptd
 projects/sgconf/sgconf
+doc/xmlrpc-doc/book
+doc/help/book