Browse files

Merge branch 'master' of github.com:mkoby/dotmatrix

  • Loading branch information...
2 parents 5e76d11 + a078a4d commit 1d968a0b085eda827e879c4d9632ba95cb8582eb @mkoby committed Mar 21, 2012
Showing with 4 additions and 16 deletions.
  1. +0 −13 setup.sh
  2. +2 −1 vim/.netrwhist
  3. +1 −1 vim/bundle/VimClojure
  4. +1 −1 vim/bundle/vim-conque
View
13 setup.sh
@@ -19,16 +19,6 @@ else
echo "${VIMRC} was not found"
fi
-if [ -h ${GVIMRC} ]; then
- echo ".gvimrc is a LINK, unlinking"
- unlink ${GVIMRC}
-elif [ -f ${GVIMRC} ]; then
- echo ".gvimrc is a FILE, deleting"
- rm -f ${GVIMRC}
-else
- echo "${GVIMRC} was not found"
-fi
-
if [ -h ${VIMFOLDER} ]; then
echo ".vim is a LINK, unlinking"
unlink ${VIMFOLDER}
@@ -75,9 +65,6 @@ fi
echo "Linking .vimrc file"
ln -s `pwd`/vimrc $VIMRC
-echo "Linking .gvimrc file"
-ln -s `pwd`/gvimrc $GVIMRC
-
echo "Linking .vim folder"
ln -s `pwd`/vim $VIMFOLDER
View
3 vim/.netrwhist
@@ -1,5 +1,6 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_cnt =4
let g:netrw_dirhist_1='/home/mkoby/git/LiveShow/app/controllers'
let g:netrw_dirhist_2='/home/mkoby/git/algorithms/ruby/sorting/insertion_sort.rb'
let g:netrw_dirhist_3='/media/Stuffage/git/grep/src'
+let g:netrw_dirhist_4='/Users/mkoby/git/tropo-test/app/controllers'
2 vim/bundle/VimClojure
@@ -1 +1 @@
-Subproject commit 181913d810270d29bb2e93f08a398247751cb158
+Subproject commit d4497538ae397efdb0f684b3d3278e4c6ec8effd
2 vim/bundle/vim-conque
@@ -1 +1 @@
-Subproject commit 19aa7c8bee402faf821d0f119c75dccfefb42713
+Subproject commit da35739921a258ecce991040f9b1537897a8ff57

0 comments on commit 1d968a0

Please sign in to comment.