diff --git a/bower.json b/bower.json
index eb2b75b8d1773c75d65df6da613b349c21044722..fae2426c8940189ad16c215fe8ca1d28a9c8f857 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "CodeMirror",
- "version": "3.13.0",
+ "version": "3.15.0",
"main": ["lib/codemirror.js", "lib/codemirror.css"],
"ignore": [
"**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index 94faf7c8530f04980e70c0c18dfb618001d27ad3..864f4f28cd8f37b3d56294a48559b8c0dbd10456 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -30,6 +30,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=3.15.0;f=">3.15</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.14.0;f=">3.14</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.13.0;f=">3.13</option>
<option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.12;f=">3.12</option>
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
index 40e15032b63cb14ef6e7827d3223e91d2511ebb0..c72dc8f61a6dea0f57f1b738710f3145f303994f 100644
--- a/doc/oldrelease.html
+++ b/doc/oldrelease.html
@@ -19,6 +19,18 @@
</pre>
</div>
+ <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
+
+ <ul class="rel-note">
+ <li>New mode: <a href="../mode/http/index.html">HTTP</a>.</li>
+ <li>Improved handling of selection anchor position.</li>
+ <li>Improve IE performance on longer lines.</li>
+ <li>Reduce gutter glitches during horiz. scrolling.</li>
+ <li>Add <a href="manual.html#addKeyMap"><code>addKeyMap</code></a> and <a href="manual.html#removeKeyMap"><code>removeKeyMap</code></a> methods.</li>
+ <li>Rewrite <code>formatting</code> and <code>closetag</code> add-ons.</li>
+ <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
+ </ul>
+
<p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
<ul class="rel-note">
diff --git a/index.html b/index.html
index 544aac1200e7091f8b3df74ed9e700df7a746b52..2f2ba050964d9952cac024f6e31bdaaaac6574fb 100644
--- a/index.html
+++ b/index.html
@@ -286,6 +286,17 @@
<h2 id=releases>Releases</h2>
+ <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
+
+ <ul class="rel-note">
+ <li>New modes: <a href="mode/jade/index.html">Jade</a>, <a href="mode/nginx/index.html">Nginx</a>.</li>
+ <li>New addons: <a href="demo/tern.html">Tern</a>, <a href="doc/manual.html#addon_matchtags">matchtags</a>, and <a href="doc/manual.html#addon_foldgutter">foldgutter</a>.</li>
+ <li>Introduced <a href="doc/manual.html#getHelper"><em>helper</em></a> concept (<a href="https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ">context</a>).</li>
+ <li>New method: <a href="doc/manual.html#getModeAt"><code>getModeAt</code></a>.</li>
+ <li>New themes: base16 <a href="demo/theme.html?base16-dark">dark</a>/<a href="demo/theme.html?base16-light">light</a>, 3024 <a href="demo/theme.html?3024-night">dark</a>/<a href="demo/theme.html?3024-day">light</a>, <a href="demo/theme.html?tomorrow-night-eighties">tomorrow-night</a>.</li>
+ <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
+ </ul>
+
<p class="rel">20-06-2013: <a href="http://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
<ul class="rel-note">
@@ -454,19 +465,6 @@
<li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
</ul>
-
- <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
-
- <ul class="rel-note">
- <li>New mode: <a href="mode/http/index.html">HTTP</a>.</li>
- <li>Improved handling of selection anchor position.</li>
- <li>Improve IE performance on longer lines.</li>
- <li>Reduce gutter glitches during horiz. scrolling.</li>
- <li>Add <a href="doc/manual.html#addKeyMap"><code>addKeyMap</code></a> and <a href="doc/manual.html#removeKeyMap"><code>removeKeyMap</code></a> methods.</li>
- <li>Rewrite <code>formatting</code> and <code>closetag</code> add-ons.</li>
- <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
- </ul>
-
<p><a href="doc/oldrelease.html">Older releases...</a></p>
</div></div>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4b99cf74e7f76030b01e68165729c9e776259f68..9451b6dbaf400dfd92fd095c1ffb39d3099effdc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5791,7 +5791,7 @@ window.CodeMirror = (function() {
// THE END
- CodeMirror.version = "3.14.1";
+ CodeMirror.version = "3.15.0";
return CodeMirror;
})();
diff --git a/package.json b/package.json
index 17e5487f2593ccf9248c647f545dc8c879748d3b..7fc90708b15cc59d703a45080292666ee826988c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codemirror",
- "version":"3.14.1",
+ "version":"3.15.0",
"main": "lib/codemirror.js",
"description": "In-browser code editing made bearable",
"licenses": [{"type": "MIT",