update and merge ignore files

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
remotes/origin/1.6
Steven Armstrong 14 years ago
parent a60e2838e3
commit fc10009946
  1. 1
      .gitignore
  2. 4
      doc/man/.gitignore

1
.gitignore vendored

@ -7,6 +7,7 @@ doc/man/man*/*.1
doc/man/man*/*.7
doc/man/man*/*.html
doc/man/man*/*.xml
doc/man/man*/cdist-reference.text
# Ignore type manpages
doc/man/man*/*__*.text

@ -1,4 +0,0 @@
cdist.7
*.html
cdist-design.7
cdist-reference.text
Loading…
Cancel
Save