Tom Willemsen cbdfa4cac3 Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .emacs.d/site-lisp/oni.el		2012-10-26 01:46:09 +02:00
..
eltuki.el	.emacs.d/site-lisp/eltuki.el	2012-10-07 13:19:23 +02:00
ext.el	.emacs.d/site-lisp/ext.el	2012-10-11 21:23:24 +02:00
metalexpress.el	.emacs.d/site-lisp/metalexpress.el	2012-10-26 00:51:39 +02:00
mode-icons.el	.emacs.d/site-lisp/mode-icons.el	2012-10-07 22:13:32 +02:00
mu4e-init.el	.emacs.d/site-lisp/mu4e-init.el	2012-10-23 00:06:23 +02:00
oni.el	Merge remote-tracking branch 'origin/master' into phoenix	2012-10-26 01:46:09 +02:00
org-init.el	.emacs.d/site-lisp/org-init.el	2012-10-24 01:02:43 +02:00
quick-edit-mode.el	.emacs.d/site-lisp/quick-edit-mode.el	2012-10-03 02:50:41 +02:00
wm-init.el	.emacs.d/site-lisp/wm-init.el	2012-10-26 00:53:28 +02:00