From 004dc9f8183ae57e3df76489f09984e17f9385ca Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@cs.cmu.edu>
Date: Mon, 20 Apr 2015 18:30:48 -0400
Subject: [PATCH] Update for release

---
 CHANGELOG.txt         | 8 ++++++++
 openslide/_version.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 05bf3036..6b0e74fd 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,14 @@
 Notable Changes in OpenSlide Python
 ===================================
 
+Version 1.1.0, 2015-04-20
+ * Improve pixel read performance using optional extension module
+ * examples: Add scale bar via OpenSeadragonScalebar plugin
+ * examples: Update OpenSeadragon to 1.2.1
+ * examples: Enable rotation buttons in multiserver
+ * examples: Verify at server startup that file was specified
+ * examples: Disable pinch zoom outside of viewer
+
 Version 1.0.1, 2014-03-09
  * Fix documentation build breakage
 
diff --git a/openslide/_version.py b/openslide/_version.py
index 81c4b279..3b5e2c11 100644
--- a/openslide/_version.py
+++ b/openslide/_version.py
@@ -22,4 +22,4 @@
 This module is an implementation detail.  The package version should be
 obtained from openslide.__version__."""
 
-__version__ = u'1.0.1'
+__version__ = u'1.1.0'