Tom Willemsen 821793e7de Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .xinitrc		2012-10-17 08:48:46 +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
mode-icons.el	.emacs.d/site-lisp/mode-icons.el	2012-10-07 22:13:32 +02:00
oni.el	Merge remote-tracking branch 'origin/master' into phoenix	2012-10-17 08:48:46 +02:00
quick-edit-mode.el	.emacs.d/site-lisp/quick-edit-mode.el	2012-10-03 02:50:41 +02:00