diff options
| author |  Tom Willemsen | 2012-07-09 19:16:54 +0000 |
|---|---|---|
| committer | Tom Willemsen | 2012-07-09 19:16:54 +0000 |
| commit | 72d124100d3fc4fb7ee9ada43385867b0c171a4d (patch) | |
| tree | 8df784474eb8519032eefcc4e8f92f2dd009ebcc /.xinitrc | |
| parent | 8b1b423d0ae8e3b899658b05ae4ecb1c430b618f (diff) | |
| parent | 65dee41a9237a67db713b2bc1bdbcc8a2cec6f67 (diff) | |
| download | dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.tar.gz dotfiles-72d124100d3fc4fb7ee9ada43385867b0c171a4d.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/fish/config.fish
.xinitrc
Diffstat (limited to '.xinitrc')
| -rw-r--r-- | .xinitrc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/.xinitrc b/.xinitrc deleted file mode 100644 index f88b958..0000000 --- a/.xinitrc +++ /dev/null @@ -1,14 +0,0 @@ -xmodmap ~/.Xmodmap -#xrandr --output VGA1 --mode 1920x1080 - -xsetroot -solid "#000000" -emacs --daemon & - -wm=$1 -test -n "$wm" || wm=herbstluftwm - -exec ck-launch-session $wm -# Local Variables: -# mode: shell-script -# eval: (git-auto-commit-mode 1) -# End: |