From 3b362779404afd56a65f98214aeb30739d083587 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Wed, 30 Apr 2014 10:34:25 -0700
Subject: [PATCH] Updated for 1.1.0 release

---
 changelog.txt | 2 +-
 package.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 94780504..a6cd4228 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,7 @@
 OPENSEADRAGON CHANGELOG
 =======================
 
-1.1.0: (in progress)
+1.1.0:
 
 * BREAKING CHANGE: the openseadragon-canvas element now has two child divs. This means: (#298)
     * The drawer element is no longer accessible via viewer.canvas.firstChild but via viewer.drawersContainer.firstChild or viewer.drawer.canvas.
diff --git a/package.json b/package.json
index 9c53ceb0..16064481 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenSeadragon",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Provides a smooth, zoomable user interface for HTML/Javascript.",
   "devDependencies": {
     "grunt": "~0.4.1",