Tom Willemsen 77c39ea0f0 Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .config/cower/config .emacs.d/init.el		2012-10-12 08:52:53 +02:00
..
themes/custom	.config/awesome/themes/custom/theme.lua	2012-10-07 13:18:05 +02:00
bowl.lua	Add awesome config	2012-09-12 23:15:44 +02:00
ext.lua	.config/awesome/ext.lua	2012-10-07 22:14:13 +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
oni.lua	.config/awesome/rc.lua	2012-10-03 02:47:17 +02:00
rc.lua	Merge remote-tracking branch 'origin/master' into phoenix	2012-10-12 08:52:53 +02:00