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

12 years ago · c5151a7269
2 changed files with 4 additions and 0 deletions
--- a/tmux.conf
+++ b/tmux.conf
@ -2,6 +2,9 @@
 set-option -g prefix C-a
 bind-key C-a last-window
 # set default shell
 set-option -g default-shell /bin/zsh 
 # Window size constraints
 setw -g aggressive-resize on
--- a/1
+++ b/1
@ -57,6 +57,7 @@ Bundle 'fholgado/minibufexpl.vim.git'
 Bundle 'Lokaltog/vim-powerline.git'
 Bundle 'Lokaltog/vim-distinguished.git'
 Bundle 'scrooloose/nerdtree.git'
 Bundle 'ervandew/supertab.git'
 " toggle showing nerd-tree
 :nmap <leader>e :NERDTreeToggle<CR>