diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
| commit | ad482d55d2f60cf3c91c9014b934af7ea30b4d88 (patch) | |
| tree | 79bb00ec5be01214f1ebc99509308f2083c17717 /.emacs.d/.gitignore | |
| parent | 2f550711d01c7aa731d75edca9bc4d2a1f718045 (diff) | |
| parent | 510fea7116c6bd01824af38b4e516b6e19fded81 (diff) | |
Merge branch 'master' into build64-par
Conflicts:
.crontab
Diffstat (limited to '.emacs.d/.gitignore')
| -rw-r--r-- | .emacs.d/.gitignore | 4 |
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/* |