From afb56fa0526c24b5c54d049d298ab69d191ccbcf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 13:50:25 +0100
Subject: [PATCH] Mark 4.0 release candidate 2
---
AUTHORS | 1 +
doc/compress.html | 1 +
doc/manual.html | 2 +-
doc/releases.html | 8 +++++++-
lib/codemirror.js | 2 +-
package.json | 2 +-
6 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 464249d7..be29dbbf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -292,6 +292,7 @@ Shmuel Englard
soliton4
sonson
spastorelli
+srajanpaliwal
Stanislav Oaserele
Stas Kobzar
Stefan Borsje
diff --git a/doc/compress.html b/doc/compress.html
index e5a77c50..cb1dfcc9 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@
<input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
<p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px;">
<option value="http://codemirror.net/">HEAD</option>
+ <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.2;f=">4.0</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.1;f=">4.0</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
diff --git a/doc/manual.html b/doc/manual.html
index 50407bb0..74504763 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -63,7 +63,7 @@
<section class=first id=overview>
<h2 style="position: relative">
User manual and reference guide
- <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.1</span>
+ <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.2</span>
</h2>
<p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index 3e2932b4..0a255198 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,7 +28,13 @@
<h2>Version 4.x</h2>
- <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
+ <p class="rel">17-03-2014: <a href="http://codemirror.net/codemirror-4.0rc2.zip">Version 4.0 release candidate 2</a>:</p>
+
+ <p class="rel-note">Second release candidate for 4.0. Fixes some
+ context menu bugs, a wheel-scrolling glitch, and several missing
+ cases in the Sublime Text bindings.</p>
+
+ <p class="rel">10-03-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
<p class="rel-note">First release candidate for 4.0, which supports
multiple selections, selection undo, and improved (faster, less
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5fd7efe5..e32bfe9b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7325,7 +7325,7 @@
// THE END
- CodeMirror.version = "4.0.1";
+ CodeMirror.version = "4.0.2";
return CodeMirror;
});
diff --git a/package.json b/package.json
index 484f7cdc..7ee1d9e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version":"4.0.1",
+ "version":"4.0.2",
"main": "lib/codemirror.js",
"description": "In-browser code editing made bearable",
"licenses": [{"type": "MIT",
--
GitLab