From 08109dcdd686b48365912046e796bc993479808f Mon Sep 17 00:00:00 2001
From: Paul Armstrong <paul@paularmstrongdesigns.com>
Date: Mon, 4 Aug 2014 12:06:55 -0700
Subject: [PATCH] bump version 1.4.2

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

diff --git a/HISTORY.md b/HISTORY.md
index 5005f1a4..8de167ac 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,14 @@
+[1.4.2](https://github.com/paularmstrong/swig/tree/v1.4.2) / 2014-08-04
+-----------------------------------------------------------------------
+
+* **Added** Report JS parse errors with template filenames. gh-492
+* **Fixed** Ensure block-level tags (`set`, etc) are parsed in correct order. gh-495
+* **Fixed** Ensure import tag uses current Swig instance's loader. gh-421, gh-503
+* **Fixed** Allow disabling cache on compile/render functions directly. gh-423
+* **Fixed** Ensure compilation does not leak global variables. gh-496
+* **Fixed** Fix for-loops to run on strings. gh-478, gh-479
+* **Fixed** Allow macro output to be assigned using `set` tag. gh-499, gh-502
+
 [1.4.1](https://github.com/paularmstrong/swig/tree/v1.4.1) / 2014-07-03
 -----------------------------------------------------------------------
 
diff --git a/browser/comments.js b/browser/comments.js
index 62858d4a..e3b6a7fd 100644
--- a/browser/comments.js
+++ b/browser/comments.js
@@ -1,2 +1,2 @@
-/*! Swig v1.4.1 | https://paularmstrong.github.com/swig | @license https://github.com/paularmstrong/swig/blob/master/LICENSE */
+/*! Swig v1.4.2 | 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/docs.json b/docs/docs.json
index 75fca278..270634fc 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -1,3 +1,3 @@
 {
-  "version": "v1.4.1"
+  "version": "v1.4.2"
 }
diff --git a/docs/index.json b/docs/index.json
index 75fca278..270634fc 100644
--- a/docs/index.json
+++ b/docs/index.json
@@ -1,3 +1,3 @@
 {
-  "version": "v1.4.1"
+  "version": "v1.4.2"
 }
diff --git a/lib/swig.js b/lib/swig.js
index 47955191..73d4cef9 100644
--- a/lib/swig.js
+++ b/lib/swig.js
@@ -8,11 +8,11 @@ var utils = require('./utils'),
 /**
  * Swig version number as a string.
  * @example
- * if (swig.version === "1.4.1") { ... }
+ * if (swig.version === "1.4.2") { ... }
  *
  * @type {String}
  */
-exports.version = "1.4.1";
+exports.version = "1.4.2";
 
 /**
  * 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 5bb50336..0a659843 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swig",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "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 1314be56..e5912633 100644
--- a/tests/basic.test.js
+++ b/tests/basic.test.js
@@ -13,8 +13,8 @@ function resetOptions() {
 }
 
 describe('version', function () {
-  it('is 1.4.1', function () {
-    expect(swig.version).to.equal('1.4.1');
+  it('is 1.4.2', function () {
+    expect(swig.version).to.equal('1.4.2');
   });
 });