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
..
themes	Add Makefiles for all files	2012-12-05 00:13:28 +01: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
Makefile	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
oni.lua	.config/awesome/rc.lua	2012-10-03 02:47:17 +02:00
rc.lua	Merge remote-tracking branch 'ryuslash/master' into phoenix	2013-02-15 15:37:42 +01:00