[Pkg-javascript-commits] [node-leveldown] 281/492: Merge branch '0.2-wip' of https://github.com/rvagg/node-leveldown into 0.2-wip

[Andrew Kelley]

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

andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.

commit e38459f71e517817d2ff938314d6dada4fe9b1f0
Merge: cbb28ad 1c3bd37
Author: Rod Vagg <rod at vagg.org>
Date:   Sun Mar 24 21:18:22 2013 +1100

    Merge branch '0.2-wip' of https://github.com/rvagg/node-leveldown into 0.2-wip

 .gitignore                                         |   9 +-
 binding.gyp                                        |  15 +
 deps/leveldb/leveldb-1.9.0/db/version_set.cc       |   4 +-
 deps/leveldb/leveldb-1.9.0/libuv_port/env_win.cc   | 692 +++++++++++++++++++++
 deps/leveldb/leveldb-1.9.0/libuv_port/port_uv.cc   |  36 ++
 deps/leveldb/leveldb-1.9.0/libuv_port/port_uv.h    | 146 +++++
 .../leveldb/leveldb-1.9.0/libuv_port/port_uv.h.bak | 153 +++++
 .../leveldb-1.9.0/libuv_port/stdint-msvc2008.h     | 247 ++++++++
 deps/leveldb/leveldb-1.9.0/libuv_port/uv_condvar.h |  45 ++
 .../leveldb-1.9.0/libuv_port/uv_condvar_posix.cc   | 139 +++++
 .../leveldb/leveldb-1.9.0/libuv_port/win_logger.cc |  79 +++
 deps/leveldb/leveldb-1.9.0/libuv_port/win_logger.h |  28 +
 deps/leveldb/leveldb-1.9.0/port/atomic_pointer.h   |  41 ++
 deps/leveldb/leveldb-1.9.0/port/port.h             |   4 +-
 deps/leveldb/leveldb.gyp                           |  65 +-
 deps/snappy/snappy.gyp                             |  15 +-
 src/async.cc                                       |   3 +-
 src/database.cc                                    |   3 +-
 src/iterator_async.cc                              |   3 +-
 19 files changed, 1692 insertions(+), 35 deletions(-)


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