Tom Willemsen 12fbc83cc7 Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .emacs.d/init.el		2013-01-04 00:06:15 +01:00
..
html-mode	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
org-mode	Merge remote-tracking branch 'origin/master' into phoenix	2012-12-05 00:44:09 +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