Merge remote-tracking branch 'origin/master' into everard

This commit is contained in:
Thomas Ruoff
2015-06-18 10:27:06 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -15,7 +15,7 @@ case $((hostname)) in
pulseaudio --start pulseaudio --start
eval $(gpg-agent --daemon) & eval $(gpg-agent --enable-ssh-support --daemon)
xrdb $HOME/.Xresources xrdb $HOME/.Xresources

2
zshrc
View File

@@ -6,7 +6,7 @@ antigen bundle gerges/oh-my-zsh-jira-plus
antigen use oh-my-zsh antigen use oh-my-zsh
antigen bundle command-not-found antigen bundle tmux
antigen theme robbyrussell antigen theme robbyrussell
antigen apply antigen apply