Tom Willemsen 934d02bcac Merge remote-tracking branch 'ryuslash/master' into phoenix ... Conflicts: .config/awesome/rc.lua .emacs.d/init.el .emacs.d/init.org .emacs.d/site-lisp/oni.el		2013-02-15 15:37:42 +01:00
..
html-mode	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
org-mode	Merge remote-tracking branch 'ryuslash/master' into phoenix	2013-02-15 15:37:42 +01:00
python-mode	Emacs: Manually set-up w3m	2012-12-28 01:56:58 +01:00
Makefile	Emacs: Include python-mode snippets	2012-12-28 02:00:04 +01:00