Permalink
Browse files

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

Conflicts:
	.gitmodules
  • Loading branch information...
2 parents 92e1f29 + b04f9ef commit dd638c25d14cce7fc6081d900cf26122d95b378d @tonio committed Apr 10, 2012
Showing with 5 additions and 0 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 .tmux.conf
  3. +1 −0 .vim/bundle/vim-afterimage
View
@@ -63,6 +63,9 @@
[submodule ".vim/bundle/matchit"]
path = .vim/bundle/matchit
url = https://github.com/tsaleh/vim-matchit.git
+[submodule ".vim/bundle/vim-afterimage"]
+ path = .vim/bundle/vim-afterimage
+ url = https://github.com/tpope/vim-afterimage.git
[submodule ".vim/bundle/smartinput"]
path = .vim/bundle/smartinput
url = https://github.com/kana/vim-smartinput.git
View
@@ -74,6 +74,7 @@ bind h select-pane -L
bind j select-pane -D
bind k select-pane -U
bind l select-pane -R
+bind-key Y run-shell "tmux save-buffer - | reattach-to-user-namespace pbcopy"
# }}}
# Resizing {{{
Submodule vim-afterimage added at 6d5527

0 comments on commit dd638c2

Please sign in to comment.