diff options
| author | David Runge <david.runge@frqrec.com> | 2014-06-17 16:14:19 +0200 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2014-06-17 16:14:19 +0200 |
| commit | cde6bd16bb48f0aecf98b656a9dcfef629e24d95 (patch) | |
| tree | 2fa89aff5efa703597710368dece60913befaf71 /.vundles.local | |
| parent | ac876bcfe938849005309a2cb5da01451094c81c (diff) | |
| parent | 3b44361df3ede6208faa6fc97d584d33889dedf5 (diff) | |
| download | dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.gz dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.bz2 dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.xz dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.zip | |
Merge branch 'master' of https://github.com/davezerave/dot
Merging local and work settings for additional vundles
* 'master' of https://github.com/davezerave/dot:
Adding bindings for vi-copy mode in tmux
Adding more work related ignores
Adding octave support
Retabbing, customizing to my user
Adding more bbb specific JACK settings
Conflicts:
.vundles.local
Diffstat (limited to '.vundles.local')
| -rw-r--r-- | .vundles.local | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.vundles.local b/.vundles.local index 2d1b274..e0a0454 100644 --- a/.vundles.local +++ b/.vundles.local @@ -9,8 +9,12 @@ Bundle "sophacles/vim-processing" "latex Bundle "vim-scripts/LaTeX-Suite-aka-Vim-LaTeX" "octave +<<<<<<< HEAD Bundle "sjas/octave.vim" " netrw Bundle "vim-scripts/netrw.vim" " ctrlp Bundle "vim-scripts/ctrlp.vim" +======= +Bundle "sjas/octave.vim" +>>>>>>> 3b44361df3ede6208faa6fc97d584d33889dedf5 |