Unstash work-local changes and merge

- Fix gitconfig to use Kaleidoscope
- Toggle solarized background with <F10>
This commit is contained in:
Eryn Wells 2013-01-24 16:30:53 -08:00
parent 059a9fa8cf
commit 2e04bc2433
3 changed files with 5 additions and 1 deletions

2
vimrc
View file

@ -126,6 +126,8 @@ endif
set bg=dark
call togglebg#map("<F10>")
" use solarized colorscheme if the terminal can support it (or we're in a GUI)
let g:solarized_termtrans = 1
let g:solarized_visibility = 'low'