Permalink
Browse files

Merge branch 'master' of github.com:znc/znc

  • Loading branch information...
2 parents 8af35e1 + 970b87a commit 96eceba0df68996f5b7fd83d02d9ce2ce9209491 Alexey Sokolov committed Nov 5, 2011
Showing with 5 additions and 1 deletion.
  1. +5 −1 src/User.cpp
View
@@ -524,7 +524,11 @@ CString CUser::AddTimestamp(time_t tm, const CString& sStr) const {
sRet += " " + sStr;
}
if (m_bAppendTimestamp) {
- sRet += " ";
+ // From http://www.mirc.com/colors.html
+ // The Control+O key combination in mIRC inserts ascii character 15,
+ // which turns off all previous attributes, including color, bold, underline, and italics.
+ sRet += "\x0F ";
+
sRet += szTimestamp;
}
}

0 comments on commit 96eceba

Please sign in to comment.