diff options
author | Neil <nyamatongwe@gmail.com> | 2015-06-27 13:20:59 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2015-06-27 13:20:59 +1000 |
commit | fd576ccb62358b496857a6439df37f90464fbba3 (patch) | |
tree | fee431a64ae19d2745b850cdf0e1264d299b30c2 | |
parent | d8b75f07b1117cad12b9c2b4acfd8f9bd28a4bc1 (diff) | |
parent | ab8d99dbac66d427de3a0ffc750fa2fb411f0759 (diff) | |
download | scintilla-mirror-fd576ccb62358b496857a6439df37f90464fbba3.tar.gz |
Merged from different machines.
-rw-r--r-- | doc/ScintillaDoc.html | 2 | ||||
-rw-r--r-- | doc/ScintillaRelated.html | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index 154747cc5..6e3bab3a6 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -3641,7 +3641,7 @@ struct Sci_TextToFind { colour)</a><br /> <a class="message" href="#SCI_MARKERSETBACKSELECTED">SCI_MARKERSETBACKSELECTED(int markerNumber, int colour)</a><br /> - <a class="message" href="#SCI_MARKERENABLEHIGHLIGHT">SCI_MARKERENABLEHIGHLIGHT(int enabled)</a><br /> + <a class="message" href="#SCI_MARKERENABLEHIGHLIGHT">SCI_MARKERENABLEHIGHLIGHT(bool enabled)</a><br /> <a class="message" href="#SCI_MARKERSETALPHA">SCI_MARKERSETALPHA(int markerNumber, int alpha)</a><br /> <a class="message" href="#SCI_MARKERADD">SCI_MARKERADD(int line, int markerNumber)</a><br /> diff --git a/doc/ScintillaRelated.html b/doc/ScintillaRelated.html index e0cd4f18b..6f31e5a56 100644 --- a/doc/ScintillaRelated.html +++ b/doc/ScintillaRelated.html @@ -455,6 +455,10 @@ Editing Components </h3> <p> + <a href="https://codemirror.net/">CodeMirror</a> + is a versatile text editor implemented in JavaScript for the browser. + </p> + <p> <a href="http://www.soft-gems.net/index.php/controls/unicodeeditor-formerly-unicode-syntax-editor">UniCodeEditor</a> is a Unicode aware syntax editor control for Delphi and C++ Builder. </p> |