[Pkg-javascript-commits] [node-iconv-lite] 39/83: Update master

[matthew pideil]

This is an automated email from the git hooks/post-receive script.

mpideil-guest pushed a commit to branch master
in repository node-iconv-lite.

commit a2daf9bc5f580d6ec3e12b66e1584d8390a9fe87
Author: lastonesky <lastonesky at gmail.com>
Date:   Fri Jul 13 09:02:14 2012 +0800

    Update master
---
 encodings/gbk.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/encodings/gbk.js b/encodings/gbk.js
index 56883a4..ab8551d 100644
--- a/encodings/gbk.js
+++ b/encodings/gbk.js
@@ -1,5 +1,6 @@
 var gbkTable = require(__dirname + '/table/gbk.js');
 module.exports = {
+	'windows936': 'gbk',
 	'gb2312': 'gbk',
 	'gbk': {
 		type: 'table',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-iconv-lite.git