Merge branch 'release/0.4.5' into develop

jeffsu · Jan 1, 2012 · 0b1fcd8 · 0b1fcd8
2 parents 2819802 + b934b4d
commit 0b1fcd8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,9 +1,13 @@
-0.4.4
+0.4.5
+----------
+  * merged 0.4.4.pre1 changes
+
+0.4.4 (yanked)
 ----------
   * fixed gem package build error
-	* fixed npm bin execute probelm
-	* added ms-parse and ms-run in gem's bin dir
-	* improved gem/npm publish command
+  * fixed npm bin execute probelm
+  * added ms-parse and ms-run in gem's bin dir
+  * improved gem/npm publish command
 
 0.4.4.pre1
 ----------
@@ -29,12 +33,12 @@
 0.4.0.pre14
 -----------
   * lookback error when no spacing
- 
+
 0.4.0.pre13
 -----------
   * lookback off by 1
   * added pp for printing tree
- 
+
 0.4.0.pre12
 -----------
   * regex bug
@@ -43,7 +47,7 @@
 0.4.0.pre11
 -----------
   * adding boot strap for web browsers
- 
+
 0.4.0.pre10
 -----------
   * multi-line comment parsing fix

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.4
+0.4.5
diff --git a/platforms/gem/lib/mochiscript/version.rb b/platforms/gem/lib/mochiscript/version.rb
@@ -1,3 +1,3 @@
 module Mochiscript
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end
diff --git a/platforms/npm/package.json b/platforms/npm/package.json
@@ -3,7 +3,7 @@
   "description": "Javascript Dessert",
   "keywords": [ "javascript", "language", "mochiscript", "compiler" ],
   "author": "Jeff Su",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "licenses": [ { "type": "MIT" }],
   "engines": { "node": ">=0.4.0" },
   "directories": { "lib": "./lib/mochiscript" },