Merge.

[dcpomatic.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3f496b4cb54ba05c90791a609e0dc6d9011022e2..cc3351558baabbdbcfe257501c77ad3c333056cf 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
@@ -18,4 +17,7 @@ doc/manual/pdf
 doc/manual/extensions.ent
 .be/id-cache
 *.pyc
-
+GPATH
+GRTAGS
+GSYMS
+GTAGS