Merge branch 'master' of https://github.com/Soares/solarized.vim

Conflicts: colors/solarized.vim
Soares · Oct 20, 2012 · 34f7c67 · 34f7c67
2 parents 5418b89 + 3e68fd3
commit 34f7c67
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/colors/solarized.vim b/colors/solarized.vim
@@ -134,7 +134,7 @@
 " Allow or disallow certain features based on current terminal emulator or
 " environment.
 
-" Terminals that support italics
+" Terminals that support italics (TODO - handle tmux/screen better)
 let s:terms_italic=[
             \"rxvt",
             \"gnome-terminal",