Merge master into stdout2 as we need some changes from master.

2016-02-06 10:27:16 +11:00 · 2016-02-06 10:27:16 +11:00 · e3fc21fd5f
commit e3fc21fd5f
parent 0507b6a80e a80d50b0ff
3 changed files with 19 additions and 8 deletions
--- a/config/config
+++ b/config/config
@ -196,6 +196,10 @@ line_wrap="on"
 # --bold on/off
 bold="on"

+# Enable/Disable Underline
+# --underline on/off
+underline="on"
+
 # Underline character
 # --underline_char char
 underline_char="-"