Tom Willemsen 55ca176cd5 Merge remote-tracking branch 'ryuslash/drd' into phoenix ... Conflicts: .config/herbstluftwm/autostart .emacs.d/init.el .xinitrc .zprofile Makefile xmonad/xmonad.hs		2013-04-11 15:37:01 +02:00
..
autostart	Merge remote-tracking branch 'ryuslash/drd' into phoenix	2013-04-11 15:37:01 +02:00
Makefile	herbstluftwm: Make autostart executable when installing	2013-03-22 13:22:12 +01:00
panel.sh	.config/herbstluftwm/panel.sh	2012-10-11 21:28:01 +02:00