Merge branch 'master' of ssh://jonfu.com/home/jon/dots

Conflicts:
	vim/.vim/bundle/lightline.vim
This commit is contained in:
Jon Dossey
2018-06-21 17:17:51 -05:00
10 changed files with 126 additions and 35 deletions

View File

@@ -1,5 +1,7 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =3
let g:netrw_dirhist_cnt =5
let g:netrw_dirhist_1='/home/jon'
let g:netrw_dirhist_2='/home/jon/.gnome'
let g:netrw_dirhist_3='/home/jon'
let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'

Submodule vim/.vim/bundle/targets.vim added at c3042dc18a

Submodule vim/.vim/bundle/vim-airline updated: e9a7a12d9e...396cc92261

Submodule vim/.vim/bundle/vim-airline-themes updated: 08c76e4cd0...26f67b9265

Submodule vim/.vim/bundle/vim-buftabline added at 14d208b1fa