Merge branch 'master' of github.com:cyplo/dotfiles

This commit is contained in:
Cyryl Plotnicki-Chudyk 2014-12-13 08:44:02 +01:00
commit efc12df821
3 changed files with 5 additions and 0 deletions

3
.gitmodules vendored
View file

@ -38,3 +38,6 @@
[submodule ".vim/bundle/vim-ctrlp"]
path = .vim/bundle/vim-ctrlp
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
View file

@ -0,0 +1 @@
icdiff.git/icdiff

1
tools/icdiff.git Submodule

@ -0,0 +1 @@
Subproject commit 0a27bea010fe3be5589840b9850bb0f883f031c7