diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-12 13:37:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-12 13:37:17 -0400 |
| commit | 2e5ea30981251fbdce38e18f3521917742c892a3 (patch) | |
| tree | d7c94a33061949007dada9d7cda5b0b748a4e8b4 /.gitignore | |
| parent | 942d8f72984377c4e69d7c55877621d434e5d687 (diff) | |
| parent | 4ebb0b51d77484fcee12fd92a71b737b1aaca283 (diff) | |
Merge branch 'master' into watch
Conflicts:
debian/changelog
git-annex.cabal
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b6b8d606d..d628f23b7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ html Utility/Touch.hs Utility/libdiskfree.o dist +# Sandboxed builds +cabal-dev +# Project-local emacs configuration +.dir-locals.el |