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
..
awesome	Merge remote-tracking branch 'origin/master' into phoenix	2012-10-12 08:52:53 +02:00
clfswm	.config/clfswm/clfswmrc	2012-10-11 21:26:24 +02:00
cower	.config/cower/config	2012-10-11 21:26:44 +02:00
fish	.config/fish/config.fish	2012-10-11 21:27:17 +02:00
herbstluftwm	.config/herbstluftwm/panel.sh	2012-10-11 21:28:01 +02:00
newsbeuter	.config/newsbeuter/config	2012-10-11 21:29:02 +02:00