Merge branch 'master' into add-common-linux-compile-file-extensions

rye · rye · commit a79b082024c3 · 2013-11-26T22:57:22.000-05:00
More updates
diff --git a/Elisp.gitignore b/Elisp.gitignore
@@ -0,0 +1,2 @@
+# Compiled
+*.elc
diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore
@@ -14,3 +14,10 @@ tramp
 
 # flymake-mode
 *_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
