Merge branch 'release/3.1.2-1'

woxihuanjia · Jul 23, 2013 · 59e465a · 59e465a
2 parents 7e09961 + 46a6e4b
commit 59e465a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/build/crypto-js.tar.gz b/build/crypto-js.tar.gz
diff --git a/builder/build.yml b/builder/build.yml
@@ -61,6 +61,7 @@ rollups:
     rabbit-legacy: [core, enc-base64, md5, evpkdf, cipher-core, rabbit-legacy]
 
     core: [core]
+    x64-core: [core, x64-core]
 
     evpkdf: [core, sha1, hmac, evpkdf]
 
@@ -116,6 +117,7 @@ exports:
     rabbit-legacy: CryptoJS.RabbitLegacy
 
     core: CryptoJS
+    x64-core: CryptoJS
 
     evpkdf: CryptoJS.EvpKDF
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "crypto-js",
 	"title": "crypto-js",
 	"description": "Modularized port of googlecode project crypto-js.",
-	"version": "3.1.2",
+	"version": "3.1.2-1",
 	"homepage": "http://github.com/evanvosberg/crypto-js",
 	"author": {
 		"name": "Evan Vosberg",