Merge branch 'release/3.1.2'

woxihuanjia · May 7, 2013 · 7e09961 · 7e09961
2 parents f68049c + cd8bbb7
commit 7e09961
Show file tree

Hide file tree

Showing 2 changed files with 1 addition 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
@@ -125,7 +125,7 @@ exports:
     format-hex:     CryptoJS.format.Hex
 
     enc-latin1: CryptoJS.enc.Latin1
-    enc-utf8:   CryptoJS.enc.Utf1
+    enc-utf8:   CryptoJS.enc.Utf8
     enc-hex:    CryptoJS.enc.Hex
     enc-utf16:  CryptoJS.enc.Utf16
     enc-base64: CryptoJS.enc.Base64