Merge remote-tracking branch 'origin/master'

[rbdr/dotfiles] / .gitmodules

diff --git a/.gitmodules b/.gitmodules
index 485105fe5a02a4dd89c53e3de5eaecd59eb344a4..64d438bc440d7b2252414deec28eac0303ba67f8 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
+[submodule "prezto"]
+       path = prezto
+       url = git://github.com/rbdr/prezto.git

 [submodule "tmux-powerline"]
        path = tmux-powerline
        url = git://github.com/erikw/tmux-powerline.git
 [submodule "tmux-powerline"]
        path = tmux-powerline
        url = git://github.com/erikw/tmux-powerline.git

-
-[submodule "ctrlp"]
+[submodule "vim/bundle/ctrlp.vim"]

   path = vim/bundle/ctrlp.vim
        url = git://github.com/kien/ctrlp.vim.git
   path = vim/bundle/ctrlp.vim
        url = git://github.com/kien/ctrlp.vim.git

-
-[submodule "vim-json"]
+[submodule "vim/bundle/vim-json"]

   path = vim/bundle/vim-json
        url = git://github.com/elzr/vim-json.git
   path = vim/bundle/vim-json
        url = git://github.com/elzr/vim-json.git

-

 [submodule "vim/bundle/vim-easymotion"]
        path = vim/bundle/vim-easymotion
        url = git://github.com/Lokaltog/vim-easymotion.git
 [submodule "vim/bundle/vim-easymotion"]
        path = vim/bundle/vim-easymotion
        url = git://github.com/Lokaltog/vim-easymotion.git


@@ -85,9 +85,6 @@
 [submodule "vim/bundle/vim-unimpaired"]
        path = vim/bundle/vim-unimpaired
        url = git://github.com/tpope/vim-unimpaired.git
 [submodule "vim/bundle/vim-unimpaired"]
        path = vim/bundle/vim-unimpaired
        url = git://github.com/tpope/vim-unimpaired.git

-[submodule "vim/bundle/vim-showmarks"]
-       path = vim/bundle/vim-showmarks
-       url = git://github.com/vimez/vim-showmarks.git

 [submodule "vim/bundle/vim-misc"]
        path = vim/bundle/vim-misc
        url = https://github.com/xolox/vim-misc
 [submodule "vim/bundle/vim-misc"]
        path = vim/bundle/vim-misc
        url = https://github.com/xolox/vim-misc


@@ -97,3 +94,18 @@
 [submodule "vim/lua-inspect"]
        path = vim/lua-inspect
        url = git://github.com/davidm/lua-inspect.git
 [submodule "vim/lua-inspect"]
        path = vim/lua-inspect
        url = git://github.com/davidm/lua-inspect.git

+[submodule "vim/bundle/mustache"]
+       path = vim/bundle/mustache
+       url = git://github.com/mustache/vim-mode.git
+[submodule "vim/bundle/api-notation.vim"]
+       path = vim/bundle/api-notation.vim
+       url = git@github.com:rbdr/api-notation.vim.git
+[submodule "vim/bundle/yajs.vim"]
+       path = vim/bundle/yajs.vim
+       url = https://github.com/othree/yajs.vim
+[submodule "vim/bundle/vim-togglelist"]
+       path = vim/bundle/vim-togglelist
+       url = https://github.com/milkypostman/vim-togglelist
+[submodule "vim/bundle/editorconfig-vim"]
+       path = vim/bundle/editorconfig-vim
+       url = https://github.com/editorconfig/editorconfig-vim.git