Merge branch 'master' of /home/carl/git/dvdomatic

[dcpomatic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3acd68165ec1941d1500cb86ccf92e28fd682a2c..0ddc1034587674153dc7625824083a5aa157f362 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,19 @@
 *~
 dvdomatic/tools/test
 experimental/ffmpeg-DVD-to-j2c/dvd_to_j2c
+deps/vobcopy-1.2.0/*.o
+deps/vobcopy-1.2.0/vobcopy
 .waf-*
 .lock-waf*
 core
 build
-films-0.1
+films-*
+src/lib/version.cc
+*.tar.bz2
+*.exe
+alignment
+sync
+doc/manual/html
+doc/manual/pdf
+doc/manual/extensions.ent
+.be/id-cache