Tom Willemsen 821793e7de Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .xinitrc		2012-10-17 08:48:46 +02:00
..
eshell	Move Emacs config	2012-09-11 10:32:30 +02:00
icons	.emacs.d/icons/scheme.xpm	2012-10-07 23:14:45 +02:00
site-lisp	Merge remote-tracking branch 'origin/master' into phoenix	2012-10-17 08:48:46 +02:00
snippets	.emacs.d/snippets/html-mode/for	2012-10-05 16:48:33 +02:00
themes	.emacs.d/themes/new-theme.el	2012-10-17 00:38:47 +02:00
.gitignore	.emacs.d/.gitignore	2012-09-27 23:33:58 +02:00
gnus.el	.emacs.d/gnus.el	2012-10-07 13:18:41 +02:00
init.el	Merge remote-tracking branch 'origin/master' into phoenix	2012-10-17 08:48:46 +02:00