From 004f5a1d69620652aa66815987cd30bf97a78657 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 22 Apr 2016 16:22:05 -0400
Subject: [PATCH] -> v0.26.0

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2f9363..e28d77b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # rollup changelog
 
+## 0.26.0
+
+* Add `noConflict`/`--no-conflict` option for UMD builds ([#580](https://github.com/rollup/rollup/pull/580))
+* Normalise relative external paths ([#591](https://github.com/rollup/rollup/pull/591))
+* Report files causing transform errors ([#609](https://github.com/rollup/rollup/pull/609))
+* Handle sourcemap segments with a single member ([#619](https://github.com/rollup/rollup/pull/619))
+* Update dependencies
+
 ## 0.25.8
 
 * Unixize entry path ([#586](https://github.com/rollup/rollup/pull/586))
diff --git a/package.json b/package.json
index 84f8456..899d93b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.25.8",
+  "version": "0.26.0",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "jsnext:main": "src/rollup.js",