Merge branch 'master' of github.com:sethwoodworth/solarized

Conflicts:
	vim-colors-solarized/README.mkd
main
Trevor Bramble 2012-08-20 00:37:42 -07:00
commit 4b2a265baa
1 changed files with 58 additions and 57 deletions

View File

@ -132,7 +132,7 @@ Solarized will work out of the box with just the two lines specified above but
does include several other options that can be set in your .vimrc file. does include several other options that can be set in your .vimrc file.
Set these in your vimrc file prior to calling the colorscheme. Set these in your vimrc file prior to calling the colorscheme.
```
option name default optional option name default optional
------------------------------------------------ ------------------------------------------------
g:solarized_termcolors= 16 | 256 g:solarized_termcolors= 16 | 256
@ -144,6 +144,7 @@ Set these in your vimrc file prior to calling the colorscheme.
g:solarized_contrast = "normal"| "high" or "low" g:solarized_contrast = "normal"| "high" or "low"
g:solarized_visibility= "normal"| "high" or "low" g:solarized_visibility= "normal"| "high" or "low"
------------------------------------------------ ------------------------------------------------
```
### Option Details ### Option Details