[Pkg-javascript-commits] [node-leveldown] 478/492: working rocksdb!

[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 10ba7caa6813648a7a12142a6c908ea921d1e3b5
Author: Rod Vagg <rod at vagg.org>
Date:   Fri Nov 15 14:59:18 2013 +1100

    working rocksdb!
---
 deps/leveldb/leveldb.gyp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 4ed6c88..30fd596 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -188,10 +188,18 @@
       , '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'

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