From 368916b7a19ddf76842ac36b93797e971e65bd83 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Wed, 11 Nov 2015 17:03:49 -0800
Subject: [PATCH] Bump version number

---
 CHANGELOG.md | 7 +++++++
 version.h    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d23757d..90a4816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.4.0
+
+* More polygon correctness
+* Query the system for the number of available CPUs instead of guessing
+* Merge input files into one layer if a layer name is specified
+* Document and install tippecanoe-enumerate and tippecanoe-decode
+
 ## 1.3.0
 
 * Tile generation is multithreaded to take advantage of multiple CPUs
diff --git a/version.h b/version.h
index b6e2a08..087d6a1 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "tippecanoe v1.3.1\n"
+#define VERSION "tippecanoe v1.4.0\n"