Tom Willemsen 12fbc83cc7 Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .emacs.d/init.el		2013-01-04 00:06:15 +01:00
..
eshell	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
site-lisp	Merge remote-tracking branch 'origin/master' into phoenix	2013-01-04 00:06:15 +01:00
snippets	Merge remote-tracking branch 'origin/master' into phoenix	2013-01-04 00:06:15 +01:00
.gitignore	.emacs.d: Ignore some more generated files	2013-01-03 23:57:00 +01:00
gnus.el	Emacs: Allow gnus to match score to To header	2012-12-30 02:49:42 +01:00
init.el	Merge remote-tracking branch 'origin/master' into phoenix	2013-01-04 00:06:15 +01:00
init.org	Emacs: Start with literate configuration again	2013-01-03 23:55:57 +01:00
Makefile	Emacs: Tangle init2.el from init.org	2013-01-03 23:57:41 +01:00