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
..
awesome	Merge remote-tracking branch 'ryuslash/master' into phoenix	2013-02-15 15:37:42 +01:00
clfswm	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
cower	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
dunst	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
fehlstart	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
fish	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
herbstluftwm	Merge remote-tracking branch 'origin/master' into phoenix	2012-12-05 00:44:09 +01:00
newsbeuter	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
zathura	Add Makefiles for all files	2012-12-05 00:13:28 +01:00
Makefile	Add Makefiles for all files	2012-12-05 00:13:28 +01:00