projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master and multifarious hackery.
[dcpomatic.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 757f42eced83e9910a9404e8679792b5026c3f32..70738a18f475189d9df36642a39ba509060e226c 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,9
+1,8
@@
*~
dvdomatic/tools/test
experimental/ffmpeg-DVD-to-j2c/dvd_to_j2c
*~
dvdomatic/tools/test
experimental/ffmpeg-DVD-to-j2c/dvd_to_j2c
-deps/vobcopy-1.2.0/*.o
-deps/vobcopy-1.2.0/vobcopy
.waf-*
.waf-*
+.waf3-*
.lock-waf*
core
build
.lock-waf*
core
build
@@
-15,4
+14,13
@@
alignment
sync
doc/manual/html
doc/manual/pdf
sync
doc/manual/html
doc/manual/pdf
-doc/manual/extensions.ent
\ No newline at end of file
+doc/manual/extensions.ent
+doc/design/*.pdf
+doc/design/*.log
+doc/design/*.aux
+.be/id-cache
+*.pyc
+GPATH
+GRTAGS
+GSYMS
+GTAGS