summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2006-04-18 15:18:31 -0700
committerCarl Worth <cworth@cworth.org>2006-04-18 15:18:31 -0700
commit448e904b2a64769aa9cfd8ea011c2b5fb6ec883b (patch)
tree3c6648d822914691133d97bc17b3ff0bd533c240 /.gitignore
parentcb778760cb87e727a701603bcea3a2cdc063d785 (diff)
parentffab2592fc5d0ccd498aff2f4e645eefe351b61b (diff)
Merge branch 'cairo' into new-sub-path
Conflicts: src/cairo-path-stroke.c src/cairo-pdf-surface.c src/cairo-ps-surface.c
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 73e1e4e7..f8e50fe9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+ChangeLog
Makefile
Makefile.in
aclocal.m4