From 6f4b79e79021211bbf1c7856bfa3b9d18428ccef Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 16 Dec 2014 09:57:13 +1100
Subject: When a text margin is displayed, for annotation lines, use the
 background colour of the base line. From Joe Mueller.

---
 doc/ScintillaHistory.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 340bcc234..79e5e398b 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -464,6 +464,7 @@
 	<td>Erik Angelin</td>
 	<td>Yusuf Ramazan Karagöz</td>
 	<td>Markus Heidelberg</td>
+	<td>Joe Mueller</td>
     </tr>
     </table>
     <p>
@@ -495,6 +496,9 @@
 	position that avoids overlapping the Scintilla text.
 	</li>
 	<li>
+	When a text margin is displayed, for annotation lines, use the background colour of the base line.
+	</li>
+	<li>
 	Reverted a fix on Qt where Qt 5.3 has returned to the behaviour of 4.x.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1575/">Bug #1575</a>.
 	</li>
-- 
cgit v1.2.3