Merge.

[dcpomatic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c37d2ea1b6b5ac97c6c56982e19117df59dbb386..cc3351558baabbdbcfe257501c77ad3c333056cf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,23 @@
 *~
 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
 films-*
+src/lib/version.cc
+*.tar.bz2
+*.exe
+alignment
+sync
+doc/manual/html
+doc/manual/pdf
+doc/manual/extensions.ent
+.be/id-cache
+*.pyc
+GPATH
+GRTAGS
+GSYMS
+GTAGS