Merge master.

[dcpomatic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e6ea313432bc34b8e736fe18a63820341d5d1dbb..70738a18f475189d9df36642a39ba509060e226c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,26 @@
 *~
 dvdomatic/tools/test
 experimental/ffmpeg-DVD-to-j2c/dvd_to_j2c
+.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
+doc/design/*.pdf
+doc/design/*.log
+doc/design/*.aux
+.be/id-cache
+*.pyc
+GPATH
+GRTAGS
+GSYMS
+GTAGS