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
..
codeblock	.emacs.d/snippets/org-mode/codeblock	2012-10-04 22:05:50 +02:00
heading	.emacs.d/snippets/org-mode/heading	2012-11-08 00:32:08 +01:00
Makefile	Emacs: Update some things	2013-01-15 12:11:41 +01:00
project	Emacs: Update some things	2013-01-15 12:11:41 +01:00
snippet	Emacs: Update some things	2013-01-15 12:11:41 +01:00