diff options
| author |  Tom Willemsen | 2012-11-15 00:13:38 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2012-11-15 00:13:38 +0100 |
| commit | 258cda86caf88bcfb16aa7ab59f790f249b92d63 (patch) | |
| tree | 0339908a5487d1e9bdff5a324e736d1d2ea2b0d5 /.xinitrc | |
| parent | 9c12ab571850a3b62791a51dd5d8fb49cfc91f92 (diff) | |
| parent | 596a8ceeb38037b53c8f6226cf8e744dff3e0065 (diff) | |
| download | dotfiles-258cda86caf88bcfb16aa7ab59f790f249b92d63.tar.gz dotfiles-258cda86caf88bcfb16aa7ab59f790f249b92d63.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Diffstat (limited to '.xinitrc')
| -rwxr-xr-x | .xinitrc | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -9,12 +9,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then unset f fi -pidof mpdscribble >& /dev/null -if [ $? -ne 0 ] -then - mpdscribble & -fi - emacs --daemon & fehlstart & |