projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[dcpomatic.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 0fd802092b9b5052d0597fa87192fbf22c23b39d..6be4e4c89a547c7499ce5cc339629c09bab63c65 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-20,9
+20,14
@@
doc/design/*.log
doc/design/*.aux
doc/manual/diagrams/*.pdf
doc/manual/diagrams/*.png
+doc/manual/colour.pdf
+doc/manual/colour.log
+doc/manual/colour.aux
.be/id-cache
*.pyc
GPATH
GRTAGS
GSYMS
GTAGS
+TAGS
+.*.swp