summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2012-01-30 00:55:30 +0100
committerGravatar Tom Willemsen2012-01-30 00:55:30 +0100
commit79fa706eeb3e2438fdf92ad2a0943202c9c5d7fa (patch)
tree587e8eaf3668f89a85f523a250702e85d5c1c39d /.gitignore
parent887ddee93cb5259942b93116611fd1fd2419d983 (diff)
parent3c43c86150e7e58be6f024c8f5d320c3b810fc04 (diff)
downloaddotfiles-79fa706eeb3e2438fdf92ad2a0943202c9c5d7fa.tar.gz
dotfiles-79fa706eeb3e2438fdf92ad2a0943202c9c5d7fa.zip
Merge remote-tracking branch 'gitorious/master' into phoenix
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f3175e8..f52128a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,8 @@ tmp/
usr/
var/
xhtml-loader.rnc
+.unison/
+.pencil/
+.emacs.d/
+.cuyo
+.lgames