Merge branch 'master' of https://github.com/asmaps/dotfiles

9 years ago · 19e9ae7996
parent 04c4582a97 e7b7747151
commit 19e9ae7996
3 changed files with 4 additions and 0 deletions
--- a/tmux.conf
+++ b/tmux.conf
@ -2,6 +2,7 @@
 set -g alternate-screen on
 # dont respect smaller windows
 setw -g aggressive-resize on
 setw -g mode-mouse on
 # command prefix
 unbind C-b
--- a/tmux.server.conf
+++ b/tmux.server.conf
@ -2,6 +2,7 @@
 set -g alternate-screen on
 # dont respect smaller windows
 setw -g aggressive-resize on
 setw -g mode-mouse on
 # command prefix
 unbind C-b
--- a/2
+++ b/2
@ -10,6 +10,8 @@ filetype off
 syntax on
 filetype indent plugin on
 set cryptmethod=blowfish2
 "" system
 set enc=utf-8
 set shell=/bin/zsh