From 3e138bf16b819fbf77eb135c1ef6461dbe828df7 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 29 May 2014 16:09:54 -0700
Subject: [PATCH] 1.4.0

---
 CHANGELOG.md | 11 +++++++++++
 js/id/id.js  |  2 +-
 package.json |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00fe4d453..f7890412b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.4.0
+
+* Ensure combobox menus are closed on blur (#2207)
+* Limit imagery_used tag to 255 characters (#2181)
+* Simplify and fix midpoint drawing logic (#2136)
+* Prefer more specific 'Crosswalk' preset over generic 'Crossing'
+* Add amenity=dojo preset
+* Correctly trim whitespace in semicolon-separated multivalues (#2236)
+* oneway fields now show "Assumed to be No" or "Assumed to be Yes" instead of "Unknown" (#2220)
+* Add turn restriction editor
+
 ## 1.3.10
 
 * `oneway=no` overrides implicit oneways on junction=roundabout, etc. (#2220)
diff --git a/js/id/id.js b/js/id/id.js
index 2c545d251..399c69a0e 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -265,7 +265,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.3.10';
+iD.version = '1.4.0';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index 051e999d0..78bd7537b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.3.10",
+  "version": "1.4.0",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {