[Pkg-javascript-commits] [node-expat] 89/371: Merge commit 'upstream/1.4.0'

[Jonas Smedegaard]

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

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

commit 736db1eb4dd9da1d3bccce2bca6bff4e7bda7385
Merge: b4f666a f87253d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Aug 21 11:02:34 2011 +0200

    Merge commit 'upstream/1.4.0'
    
    Conflicts:
    	.gitignore (manually resolved)

 .gitignore        |   4 +
 bench.js          |   2 +-
 install.sh        |   4 -
 lib/node-expat.js |  38 +++++++
 node-expat.cc     |  81 +++++++++++----
 package.json      |  12 ++-
 test.js           | 305 +++++++++++++++++++++++++++++++-----------------------
 wscript           |   7 ++
 8 files changed, 291 insertions(+), 162 deletions(-)

diff --cc .gitignore
index b408e6c,5c68e8c..9e60860
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,5 @@@
 +/.pc
+ .lock-wscript
+ node_modules
+ build
+ *.swp

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