Merge master.

[dcpomatic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 31dbd5e1f85bd1bda01ee9f5977b2d42323dba60..3dc9f50fb5391c3ea4833316ea0a929341a7b256 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
 *~
 dvdomatic/tools/test
 experimental/ffmpeg-DVD-to-j2c/dvd_to_j2c
-deps/vobcopy-1.2.0/*.o
-deps/vobcopy-1.2.0/vobcopy
 .waf-*
+.waf3-*
 .lock-waf*
 core
 build
@@ -13,3 +12,20 @@ src/lib/version.cc
 *.exe
 alignment
 sync
+doc/manual/html
+doc/manual/pdf
+doc/manual/extensions.ent
+doc/design/*.pdf
+doc/design/*.log
+doc/design/*.aux
+doc/manual/diagrams/*.pdf
+doc/manual/diagrams/*.png
+doc/manual/colour.pdf
+doc/manual/colour.log
+doc/manual/colour.aux
+.be/id-cache
+*.pyc
+GPATH
+GRTAGS
+GSYMS
+GTAGS