Merge branch 'master' into speed-up

[dcpomatic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f57fb980cae1e0b8ee9fc0489e1fc760e845b6b7..ac1e274464f9d1a4a6cf208b850d6ff864ffa286 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +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-*
 src/lib/version.cc
+*.tar.bz2
+*.exe
+alignment
+sync
+doc/manual/html
+doc/manual/pdf
+doc/manual/extensions.ent
+.be/id-cache
+*.pyc
+