summaryrefslogtreecommitdiff
path: root/.emacs.d/.gitignore
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-08-21 22:47:23 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-08-21 22:47:23 -0400
commit510fea7116c6bd01824af38b4e516b6e19fded81 (patch)
tree99bc145f164a450b95c9a35a1b2e0315ca1d98bb /.emacs.d/.gitignore
parent69e7a06e976bbad54684b8c650853020c8352adb (diff)
parent6368f5b020f65de535ce74ad69bf64702daddb48 (diff)
Merge branch 'hp-dv6426us-par'
Diffstat (limited to '.emacs.d/.gitignore')
-rw-r--r--.emacs.d/.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
index 675a8be..ef4ec20 100644
--- a/.emacs.d/.gitignore
+++ b/.emacs.d/.gitignore
@@ -1,7 +1,9 @@
auto-save-list/*
el-get/*
-server/*
elmo/*
+elpa/*
image-dired/*
+server/*
session.*
+tramp
url/*