dotfiles - My configuration files

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'ryuslash/master' into phoenix	Tom Willemsen	2013-02-15	3	-1/+66
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .config/awesome/rc.lua .emacs.d/init.el .emacs.d/init.org .emacs.d/site-lisp/oni.el
\| *	Emacs: Update some things	Tom Willemsen	2013-01-15	3	-1/+66
\| \|
* \|	Merge remote-tracking branch 'origin/master' into phoenix	Tom Willemsen	2012-12-05	1	-0/+4
\|\\| \| \| \| \| \| \| \| \|	Conflicts: .emacs.d/site-lisp/oni.el
\| *	Add Makefiles for all files	Tom Willemsen	2012-12-05	1	-2/+2
\| \|
\| *	Add Makefiles to .emacs.d	Tom Willemsen	2012-12-04	1	-0/+4
\| \|
* \|	.emacs.d/snippets/org-mode/heading	Tom Willemsen	2012-11-08	1	-5/+5
\|/
*	.emacs.d/snippets/org-mode/codeblock	Tom Willemsen	2012-10-04	1	-0/+7
\|
*	.emacs.d/snippets/org-mode/heading	Tom Willemsen	2012-10-04	1	-0/+9