diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-26 15:31:11 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-26 15:31:11 -0400 |
| commit | 836fd82b9d81bab9f13084c2484612676924f428 (patch) | |
| tree | f76521868bc36d74b850ab64b07789abe4708ff8 /.emacs | |
| parent | 2d34aa1498b04f0128d58cace1f5a275d74bdfe5 (diff) | |
| parent | 84f05a28857bd1c4de055abfb57988330532fefe (diff) | |
Merge branch 'master' into hp-dv6426us-par
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 |