Tom Willemsen 5b8d412cf7 Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .emacs.d/init.el		2012-09-25 22:20:43 +02:00
..
themes/custom	.config/awesome/	2012-09-14 10:31:10 +02:00
bowl.lua	Add awesome config	2012-09-12 23:15:44 +02:00
infoline.lua	Add awesome config	2012-09-12 23:15:44 +02:00
keychain.lua	Add awesome config	2012-09-12 23:15:44 +02:00
rc.lua	Merge remote-tracking branch 'origin/master' into phoenix	2012-09-25 22:20:43 +02:00