Merge branch 'master' into dev

Conflicts:
	doc/airline.txt
This commit is contained in:
Bailey Ling
2013-09-01 10:28:04 -04:00
6 changed files with 34 additions and 32 deletions

View File

@@ -26,7 +26,6 @@ function! airline#add_inactive_statusline_func(name)
endfunction
function! airline#load_theme()
highlight! default link airline_warning WarningMsg
call airline#highlighter#load_theme()
call airline#extensions#load_theme()
endfunction