From 0b0f0fa73cfe9df2fc167bcba291b257e0b4b1fb Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 18 Aug 2012 13:19:27 +0200
Subject: Merge .emacs.d

---
 .emacs.d/.gitignore | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .emacs.d/.gitignore

(limited to '.emacs.d/.gitignore')

diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
new file mode 100644
index 0000000..326a586
--- /dev/null
+++ b/.emacs.d/.gitignore
@@ -0,0 +1,16 @@
+tramp
+elpa
+bookmarks
+abbrev_defs
+custom.el
+*.elc
+ac-comphist.dat
+auto-save-list/
+url/
+packages/
+newsticker/
+templates/
+themes/
+rinit.*
+!rinit.org
+history
-- 
cgit v1.2.3-54-g00ecf