summaryrefslogtreecommitdiff
path: root/.emacs.d
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-05-22 23:46:29 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-05-22 23:46:29 -0400
commitd26fda540c355fa37a1381b11765c47fdc5bd006 (patch)
treef6510335adf691d662cae765cb7f77dcdcbf4efc /.emacs.d
parent3b8d4575218ab6d8e1155a81c45d81a8631aff25 (diff)
parent7036a9b36396ae49cf8ba0f8ad5fe139a65433c1 (diff)
Merge branch 'hp-dv6426us-par'
Conflicts: .crontab.local .git.info.exclude .wmii/wmiirc_local
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
index 2cae575..675a8be 100644
--- a/.emacs.d/.gitignore
+++ b/.emacs.d/.gitignore
@@ -4,3 +4,4 @@ server/*
elmo/*
image-dired/*
session.*
+url/*