diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-27 15:20:39 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-27 15:20:39 -0400 |
| commit | 3d607ee3f5dc7fd27bbce6c447e02778310a4b9d (patch) | |
| tree | 584c6b0c0e8b1041e2c9483e218b035cb02d1eee /.emacs | |
| parent | ad482d55d2f60cf3c91c9014b934af7ea30b4d88 (diff) | |
| parent | d794d461f2e91af847beed7783cde2c7e65fd725 (diff) | |
Merge branch 'master' into build64-par
Conflicts:
.login-daemons
Diffstat (limited to '.emacs')
| -rw-r--r-- | .emacs | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -43,9 +43,10 @@ (setq my-el-get-packages '(el-get ; nxhtml + apel flim semi wanderlust smarttabs )) - + ;; Now load all of that ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ELPA |