[Pkg-javascript-commits] [node-leveldown] 486/492: @0.0.0-a04 remove ldb_tool.cc from build

[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 3ff8a4833ebadf0a58ea01518287c7c44d8b819a
Author: Rod Vagg <rod at vagg.org>
Date:   Fri Nov 15 16:23:03 2013 +1100

    @0.0.0-a04 remove ldb_tool.cc from build
---
 deps/leveldb/leveldb.gyp | 6 ------
 package.json             | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 30fd596..dfb4caf 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -188,18 +188,12 @@
       , 'leveldb-<(ldbversion)/util/statistics.cc'
       , 'leveldb-<(ldbversion)/util/histogram.cc'
       , 'leveldb-<(ldbversion)/util/arena_impl.cc'
-<<<<<<< HEAD
-=======
       , 'leveldb-<(ldbversion)/util/ldb_tool.cc'
->>>>>>> working rocksdb!
       , 'leveldb-<(ldbversion)/util/coding.cc'
       , 'leveldb-<(ldbversion)/util/perf_context.cc'
       , 'leveldb-<(ldbversion)/util/hash.cc'
       , 'leveldb-<(ldbversion)/util/logging.cc'
-<<<<<<< HEAD
-=======
       , 'leveldb-<(ldbversion)/util/ldb_cmd.cc'
->>>>>>> working rocksdb!
       , 'leveldb-<(ldbversion)/util/hash_skiplist_rep.cc'
       , 'leveldb-<(ldbversion)/util/auto_roll_logger.cc'
       , 'leveldb-<(ldbversion)/util/blob_store.cc'
diff --git a/package.json b/package.json
index 569ef56..3cb3f34 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name"            : "rocksdb"
   , "description"     : "A Node.js RocksDB binding, LevelDOWN-compatible (alpha release)"
-  , "version"         : "0.0.0-a03"
+  , "version"         : "0.0.0-a04"
   , "contributors"    : [
         "Rod Vagg <r at va.gg> (https://github.com/rvagg)"
       , "John Chesley <john at chesl.es> (https://github.com/chesles/)"

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