Merge branch 'master' into dev

2013-09-01 18:55:46 +00:00 · 2013-09-01 18:55:46 +00:00 · c994d08a6d
parent 16028e69dc 08f87f2103
commit c994d08a6d
1 changed files with 1 additions and 0 deletions
--- a/autoload/airline/init.vim
+++ b/autoload/airline/init.vim
@ -41,6 +41,7 @@ function! airline#init#bootstrap()
  call s:check_defined('g:airline_theme_map', {})
  call extend(g:airline_theme_map, {
        \ 'Tomorrow.*': 'tomorrow',
+        \ 'base16.*': 'base16',
        \ 'mo[l|n]okai': 'molokai',
        \ 'wombat.*': 'wombat',
        \ '.*solarized.*': 'solarized',