[Pkg-javascript-commits] [node-iconv-lite] 05/83: Merge pull request #1 from jenkinv/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 4bd95db13723d9c5d3610aca918fe3053eea334d
Merge: 0a09402 e559c6b
Author: ashtuchkin <ashtuchkin at gmail.com>
Date:   Wed Nov 23 04:30:26 2011 -0800

    Merge pull request #1 from jenkinv/master
    
    gbk,gb2312 encoding for Simple Chinese language supported

 encodings/gbk.js       |  8 ++++++
 encodings/table/gbk.js |  1 +
 index.js               | 66 ++++++++++++++++++++++++++++++++++++++++++++++++--
 package.json           |  3 ++-
 test/gbk-test.js       | 30 +++++++++++++++++++++++
 test/gbkFile.txt       | 14 +++++++++++
 6 files changed, 119 insertions(+), 3 deletions(-)

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