From 4fc600be8958755d5ba49ae93b764b599c3a7271 Mon Sep 17 00:00:00 2001
From: Jason Killian <JKillian@users.noreply.github.com>
Date: Sat, 25 Jun 2016 16:06:20 -0400
Subject: [PATCH] Prepare release v3.12.0 (#1344)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a2784c900e..83eafcec867 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,33 @@
 Change Log
 ===
 
+v3.12.0
+---
+* Stable release containing changes from the last dev release (v3.12.0-dev.0)
+
+v3.12.0-dev.0
+---
+* [new-rule] `only-arrow-functions` rule (#1318)
+* [new-rule] `no-unused-new` rule (#1316)
+* [new-rule-option] `arrow-call-signature` option for `typedef` rule (#1284)
+* [enhancement] Metadata for every rule (#1311)
+* [enhancement] `typedef` rule is more flexible about the location of typedefs for arrow functions (#1176)
+* [enhancement] Failure messages are clearer and more consistent for many rules (#1303, #1307, #1309)
+* [bugfix] `no-consecutive-blank-lines` now handles lines with only whitespace correctly (#1249)
+* [bugfix] Correctly load `.json` config files that have a BOM (#1338)
+
+Thanks to our contributors!
+* @allannienhuis
+* @arnaudvalle
+* @bencoveney
+* @chrismbarr
+* @corydeppen
+* @HamletDRC
+* @JoshuaKGoldberg
+* @timbrown81
+* @tomduncalf
+* @YuichiNukiyama
+
 v3.11.0
 ---
 * Stable release containing changes from the last dev release (v3.11.0-dev.0)
diff --git a/package.json b/package.json
index 61b2db9212b..616988e6108 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.11.0",
+  "version": "3.12.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 012569440d6..6f98ff81548 100644
--- a/src/tslint.ts
+++ b/src/tslint.ts
@@ -33,7 +33,7 @@ import { loadRules } from "./ruleLoader";
 import { arrayify } from "./utils";
 
 class Linter {
-    public static VERSION = "3.11.0";
+    public static VERSION = "3.12.0";
 
     public static findConfiguration = findConfiguration;
     public static findConfigurationPath = findConfigurationPath;