Permalink
Browse files

Merge branch 'master' into nox

  • Loading branch information...
2 parents 70abffc + 68e252b commit e1632db78d6cdf03683aa900480e856eb2764352 Wei Dai committed Apr 8, 2012
View
@@ -31,9 +31,6 @@
[submodule ".vim/bundle/vim-endwise"]
path = .vim/bundle/vim-endwise
url = https://github.com/tpope/vim-endwise.git
-[submodule ".vim/bundle/snipmate.vim"]
- path = .vim/bundle/snipmate.vim
- url = https://github.com/msanders/snipmate.vim.git
[submodule ".vim/bundle/Vicle"]
path = .vim/bundle/Vicle
url = https://github.com/clvv/Vicle.git
@@ -70,3 +67,12 @@
[submodule ".vim/bundle/ack.vim"]
path = .vim/bundle/ack.vim
url = https://github.com/mileszs/ack.vim.git
+[submodule ".vim/bundle/tlib_vim"]
+ path = .vim/bundle/tlib_vim
+ url = https://github.com/tomtom/tlib_vim.git
+[submodule ".vim/bundle/vim-addon-mw-utils"]
+ path = .vim/bundle/vim-addon-mw-utils
+ url = https://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule ".vim/bundle/vim-snipmate"]
+ path = .vim/bundle/vim-snipmate
+ url = https://github.com/garbas/vim-snipmate.git
Submodule Lucius updated 2 files
+18 −14 README
+102 −16 colors/lucius.vim
Submodule snipmate.vim deleted from f5a75d
Submodule tlib_vim added at 4bfa2d
Submodule vim-snipmate added at f1e851
View
3 .vimrc
@@ -62,6 +62,9 @@ let g:tagbar_expand = 1
" JSLint.vim
let g:JSLintHighlightErrorLine = 0
+" Lucius
+let g:lucius_style = 'dark_dim'
+
" }}}
" }}}

0 comments on commit e1632db

Please sign in to comment.