Permalink
Browse files

merged origin

  • Loading branch information...
2 parents 74fed6e + 3ff78a0 commit 013afe390333914af9433fc2f7530739a822248c @thinktainer committed Aug 25, 2012
Showing with 9 additions and 7 deletions.
  1. +4 −0 .gitmodules
  2. +0 −4 .netrwhist
  3. +1 −0 bundle/vim-colors-solarized
  4. +4 −3 vimrc
View
4 .gitmodules
@@ -66,3 +66,7 @@
path = bundle/vim-ruby
url = git://github.com/vim-ruby/vim-ruby.git
ignore = dirty
+[submodule "bundle/vim-colors-solarized"]
+ path = bundle/vim-colors-solarized
+ url = git://github.com/altercation/vim-colors-solarized.git
+ ignore = dirty
View
4 .netrwhist
@@ -1,4 +0,0 @@
-let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =2
-let g:netrw_dirhist_1='/home/mschinz/.wine'
-let g:netrw_dirhist_2='/home/mschinz/.vim/.git'
1 bundle/vim-colors-solarized
@@ -0,0 +1 @@
+Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
View
7 vimrc
@@ -15,7 +15,9 @@ set scrolloff=3
set laststatus=2
set nocompatible
set hidden
-colorscheme vividchalk
+
+set background=dark
+colorscheme solarized
version 6.0
if &cp | set nocp | endif
@@ -52,7 +54,6 @@ nmap <D-v> "*P
let &cpo=s:cpo_save
unlet s:cpo_save
-set background=dark
set backspace=indent,eol,start
set fileencodings=ucs-bom,utf-8,default,latin1
set guitablabel=%M%t
@@ -74,7 +75,7 @@ syntax on
set hlsearch
runtime! ftplugin/man.vim
" ctags for cppcomplete:
-set tags=./tags,../tags,~/Projects/Carstuning/tags,~/tags
+set tags=./tags;/
set hidden
autocmd BufRead *_spec.rb syn keyword rubyRspec describe context it specify it_should_behave_like before after setup subject its shared_examples_for shared_context let

0 comments on commit 013afe3

Please sign in to comment.