From 965edda84e6efe58ef059d55746cf6bf3f6ccfb8 Mon Sep 17 00:00:00 2001
From: Jason Killian <JKillian@users.noreply.github.com>
Date: Wed, 27 Jul 2016 18:00:06 -0400
Subject: [PATCH] Prepare release v3.14.0 (#1440)

---
 CHANGELOG.md  | 29 +++++++++++++++++++++++++++++
 package.json  |  2 +-
 src/tslint.ts |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b58903a603..485bbd75755 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,35 @@
 Change Log
 ===
 
+v3.14.0
+---
+* Stable release containing changes from the last dev releases (v3.14.0-dev.0, v3.14.0-dev.1)
+
+v3.14.0-dev.1
+---
+* [new-rule] `arrow-parens` rule (#777)
+* [new-rule] `max-file-line-count` rule (#1360)
+* [new-rule] `no-unsafe-finally` rule (#1349)
+* [new-rule] `no-for-in-array` rule (#1380)
+* [new-rule] `object-literal-key-quotes` rule (#1364)
+* [enhancement] Better `ban` rule failure messages (#1385)
+* [enhancement] New stylish formatter (#1406)
+
+Thanks to our contributors!
+* @chrismbarr
+* @danvk
+* @gjuchault
+* @lowkay
+* @ScottSWu
+* @YuichiNukiyama
+
+v3.14.0-dev.0
+---
+* [enhancement] Add optional type information to rules (#1323)
+
+Thanks to our contributors!
+* @ScottSWu
+
 v3.13.0
 ---
 * Stable release containing changes from the last dev release (v3.13.0-dev.0)
diff --git a/package.json b/package.json
index a4918513b0b..8a19cf8ab65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.13.0",
+  "version": "3.14.0",
   "description": "An extensible static analysis linter for the TypeScript language",
   "bin": {
     "tslint": "./bin/tslint"
diff --git a/src/tslint.ts b/src/tslint.ts
index 157ff74d41a..ce5da182dd2 100644
--- a/src/tslint.ts
+++ b/src/tslint.ts
@@ -36,7 +36,7 @@ import { loadRules } from "./ruleLoader";
 import { arrayify } from "./utils";
 
 class Linter {
-    public static VERSION = "3.13.0";
+    public static VERSION = "3.14.0";
 
     public static findConfiguration = findConfiguration;
     public static findConfigurationPath = findConfigurationPath;