From d694c7ea6ca81c24a74a6bbd88dbddfc71501c70 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Mon, 5 Jan 2015 13:17:05 -0800
Subject: [PATCH] Version bump

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

diff --git a/changelog.txt b/changelog.txt
index 5485d015..4e71760e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,7 @@
 OPENSEADRAGON CHANGELOG
 =======================
 
-1.2.0: (in progress)
+1.2.0:
 
 * New combined IIIF TileSource for 1.0 through 2.0 (#441)
     * BREAKING CHANGE: Removed IIIF1_1TileSource (now that IIIFTileSource supports all versions)
diff --git a/package.json b/package.json
index 486d8743..6aa039fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenSeadragon",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Provides a smooth, zoomable user interface for HTML/Javascript.",
   "devDependencies": {
     "grunt": "^0.4.5",