summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-21 01:05:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-21 01:05:37 -0400
commit019d0735052d2688dc0bdeb6ba51c46b77303aaf (patch)
tree38ba3d3e4e251db1e757e1ce5cac38135e172bf9 /.gitignore
parentc70c036707815d6be1919116c58acecaa6d3c1a7 (diff)
parent7db83a1b0ff49ddbc316556d416ce67418428d13 (diff)
Merge branch 'watch'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d628f23b7..afb5f314e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ html
*.tix
.hpc
Utility/Touch.hs
-Utility/libdiskfree.o
+Utility/*.o
dist
# Sandboxed builds
cabal-dev