Merge branch 'master' of github.com:cyplo/dotfiles
This commit is contained in:
commit
efc12df821
3 changed files with 5 additions and 0 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -38,3 +38,6 @@
|
||||||
[submodule ".vim/bundle/vim-ctrlp"]
|
[submodule ".vim/bundle/vim-ctrlp"]
|
||||||
path = .vim/bundle/vim-ctrlp
|
path = .vim/bundle/vim-ctrlp
|
||||||
url = https://github.com/kien/ctrlp.vim.git
|
url = https://github.com/kien/ctrlp.vim.git
|
||||||
|
[submodule "tools/icdiff.git"]
|
||||||
|
path = tools/icdiff.git
|
||||||
|
url = https://github.com/jeffkaufman/icdiff.git
|
||||||
|
|
1
tools/icdiff
Symbolic link
1
tools/icdiff
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
icdiff.git/icdiff
|
1
tools/icdiff.git
Submodule
1
tools/icdiff.git
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 0a27bea010fe3be5589840b9850bb0f883f031c7
|
Loading…
Reference in a new issue