summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2012-02-25 21:53:39 +0100
committerGravatar Tom Willemsen2012-02-25 21:53:39 +0100
commitfada655438a5021123e6b46014f9ab0db2cebca3 (patch)
tree2f9c93056daed3a1a72d30d50521d607a75d12c4 /.gitignore
parentab27e7a3bb8b20a3efb7186c65d982345de5fdd4 (diff)
parent4e448f27ecaf9c3776f2e3cc691281aaeb5f7f05 (diff)
downloaddotfiles-fada655438a5021123e6b46014f9ab0db2cebca3.tar.gz
dotfiles-fada655438a5021123e6b46014f9ab0db2cebca3.zip
Merge remote-tracking branch 'gitorious/master' into phoenix
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index a840b29..30a7d0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,7 +104,6 @@ xhtml-loader.rnc
.emacs.d/
.cuyo
.lgames
-.bash*
.beetsmusic.blb
.beetsstate
.msmtprc