From b4a720b65ebd715e056f33927bf59a7f233b94ab Mon Sep 17 00:00:00 2001
From: Jason Killian <jkillian@palantir.com>
Date: Fri, 19 Feb 2016 17:41:36 -0500
Subject: [PATCH] Prepare release v3.4.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d6bda4f7ab..46d2ab350fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,44 @@
 Change Log
 ===
 
+v3.4.0
+---
+* Stable release containing changes from the last two dev releases
+
+v3.4.0-dev.2
+---
+* [new-rule-option] "arrow-parameter" option for `typedef` rule (#333)
+* [new-rule-option] "never" option for `semicolon` rule (#363)
+* [new-rule-option] "onespace" setting for `typedef-whitespace` rule (#888)
+* [new-rule-option] `typedef-whitespace` rule can now check spacing on right side of typdef colon (#888)
+* [enhancement] `member-ordering` rule treats arrow functions as methods (#226)
+* [bugfix] Handle spaces before typedefs correctly in `typedef-whitespace` rule (#955)
+* [bugfix] `label-position` rule now allows labels on `for-of` loops (#959)
+
+Thanks to our contributors!
+* @b0r3as
+* @ChaseMoskal
+* @Pajn
+* @pe8ter
+* @tomduncalf
+
+v3.4.0-dev.1
+---
+* [enhancement] Revamped testing system (#620)
+  * Writing tests for rules is now much simpler with a linter DSL.
+    See exisitng tests in `test/rules/**/*.ts.lint` for examples.
+* [enhancement] New msbuild formatter (#947)
+* [bugfix] Fix handling of multiline literals in `trailing-comma` rule (#856)
+* [bugfix] `one-line` rule correctly checks space between `catch` and opening brace (#925)
+* [bugfix] `one-line` rule correctly checks multiline variable declarations (#935)
+* [new-rule-option] New option `check-finally` for `one-line` rule (#925)
+* __BREAKING CHANGES__
+  * [bugfix] Report error when a rule in the config file is not found (#598)
+
+Thanks to our contributors!
+* @mmv
+* @pe8ter
+
 v3.3.0
 ---
 * [bugfix] Tweak TSLint build so TSLint works with typescript@next (#926)
diff --git a/package.json b/package.json
index 35937795dcd..12617b0acd3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"
diff --git a/src/tslint.ts b/src/tslint.ts
index 8701be62d2c..54d61969bf3 100644
--- a/src/tslint.ts
+++ b/src/tslint.ts
@@ -25,7 +25,7 @@ import {ILinterOptions, LintResult} from "./lint";
 import {loadRules} from "./ruleLoader";
 
 class Linter {
-    public static VERSION = "3.3.0";
+    public static VERSION = "3.4.0";
     public static findConfiguration = config;
 
     private fileName: string;