[Pkg-javascript-commits] [node-sha.js] 103/237: Merge branch 'buffer'

[Bastien Roucariès]

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

rouca pushed a commit to branch master
in repository node-sha.js.

commit ea3a4ad0ecf227fe2fee6eb18a652fb1b47eac8a
Merge: c61542e 6f03926
Author: Dominic Tarr <dominic.tarr at gmail.com>
Date:   Wed Jan 15 16:00:40 2014 +0700

    Merge branch 'buffer'
    
    Conflicts:
      sha1.js

 bin.js          |  12 +--
 browserify.js   |  12 +++
 hash.js         | 164 ++++++++++++++++++-------------------
 index.js        |   7 +-
 sha1.js         | 227 +++++++++++++++++++++++++++-------------------------
 sha256.js       | 244 ++++++++++++++++++++++++++++----------------------------
 test/enc.js     |  34 ++++++--
 test/hash.js    |  27 ++++---
 test/test.js    |   2 +-
 test/vectors.js |   7 +-
 util.js         |  17 +---
 11 files changed, 390 insertions(+), 363 deletions(-)

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