From 236ca16f3be01b02f286409325291622b1100524 Mon Sep 17 00:00:00 2001
From: Paul Armstrong <paul@paularmstrongdesigns.com>
Date: Sun, 1 Dec 2013 16:49:40 -0800
Subject: [PATCH] version bump 1.2.0

---
 HISTORY.md          | 11 +++++++++++
 browser/comments.js |  2 +-
 docs/index.json     |  2 +-
 lib/swig.js         |  4 ++--
 package.json        |  2 +-
 tests/basic.test.js |  4 ++--
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index ea7b5651..d0021137 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,14 @@
+[1.2.0](https://github.com/paularmstrong/swig/tree/v1.2.0) / 2013-12-01
+-------------------------------------------------------------------------------
+
+* **Added** Filepath parameter can be passed to swig.run to allow extends in-browser. gh-349
+* **Changed** Use local-context first for var lookups. gh-344, gh-347
+* **Changed** Allow DOTKEY after functions/objects/filters. gh-355
+* **Changed** Context of for-tags carries into includes. gh-356
+* **Changed** When a callback is passed into compileFile, catch all errors thrown by compile and pass the error to callback. gh-340
+* **Fixed** Instances of Swig retain their options properly. gh-351
+* **Fixed** Fix misc documentation issues. gh-359, gh-358
+
 [1.1.0](https://github.com/paularmstrong/swig/tree/v1.1.0) / 2013-10-02
 -------------------------------------------------------------------------------
 
diff --git a/browser/comments.js b/browser/comments.js
index 600dc3aa..bc17ee0e 100644
--- a/browser/comments.js
+++ b/browser/comments.js
@@ -1,2 +1,2 @@
-/*! Swig v1.1.0 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
+/*! Swig v1.2.0 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
 /*! DateZ (c) 2011 Tomo Universalis | @license https://github.com/TomoUniversalis/DateZ/blob/master/LISENCE */
diff --git a/docs/index.json b/docs/index.json
index a905d1aa..45074509 100644
--- a/docs/index.json
+++ b/docs/index.json
@@ -1,3 +1,3 @@
 {
-  "version": "v1.1.0"
+  "version": "v1.2.0"
 }
diff --git a/lib/swig.js b/lib/swig.js
index 540c7a29..c9085242 100644
--- a/lib/swig.js
+++ b/lib/swig.js
@@ -9,11 +9,11 @@ var fs = require('fs'),
 /**
  * Swig version number as a string.
  * @example
- * if (swig.version === "1.1.0") { ... }
+ * if (swig.version === "1.2.0") { ... }
  *
  * @type {String}
  */
-exports.version = "1.1.0";
+exports.version = "1.2.0";
 
 /**
  * Swig Options Object. This object can be passed to many of the API-level Swig methods to control various aspects of the engine. All keys are optional.
diff --git a/package.json b/package.json
index 1b7a1693..958ffe6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swig",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A simple, powerful, and extendable templating engine for node.js and browsers, similar to Django, Jinja2, and Twig.",
   "keywords": [
     "template",
diff --git a/tests/basic.test.js b/tests/basic.test.js
index b313834f..08767f1f 100644
--- a/tests/basic.test.js
+++ b/tests/basic.test.js
@@ -13,8 +13,8 @@ function resetOptions() {
 }
 
 describe('version', function () {
-  it('is 1.1.0', function () {
-    expect(swig.version).to.equal('1.1.0');
+  it('is 1.2.0', function () {
+    expect(swig.version).to.equal('1.2.0');
   });
 });