From 99370d2fe7e426588f3f9492d9922599f992d6d6 Mon Sep 17 00:00:00 2001
From: Jason Killian <JKillian@users.noreply.github.com>
Date: Wed, 8 Jun 2016 16:01:14 -0400
Subject: [PATCH] Prepare release v3.11.0 (#1298)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e281d07a92..cbd3d303c5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,28 @@
 Change Log
 ===
 
+v3.11.0
+---
+* Stable release containing changes from the last dev release (v3.11.0-dev.0)
+
+v3.11.0-dev.0
+---
+* [new-rule] `linebreak-style` rule (#123)
+* [new-rule] `no-mergable-namespace` rule (#843)
+* [enhancement] Add built-in configurations (#1261)
+* [enhancement] New vso formatter (#1281)
+* [new-rule-option] `ignore-interfaces` option for `semicolon` rule (#1233)
+* [bugfix] `no-default-export` rule handles more default export cases (#1241)
+
+Thanks to our contributors!
+* @cgwrench
+* @HamletDRC
+* @lijunle
+* @paldepind
+* @patsissons
+* @schmuli
+* @YuichiNukiyama
+
 v3.10.2
 ---
 * Stable release containing changes from the last dev release (v3.10.0-dev.2)
diff --git a/package.json b/package.json
index 469f59b1d59..03fcf0a728f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.10.2",
+  "version": "3.11.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 552d6a25dbd..b269113a41a 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.10.2";
+    public static VERSION = "3.11.0";
 
     public static findConfiguration = findConfiguration;
     public static findConfigurationPath = findConfigurationPath;