diff options
| author | Denis Dzyubenko <[email protected]> | 2012-04-11 15:59:00 +0200 |
|---|---|---|
| committer | Denis Dzyubenko <[email protected]> | 2012-04-11 16:54:46 +0200 |
| commit | 6b7df60a752422b1f6ff07bb2682c21e18a43985 (patch) | |
| tree | 3e56bd3f4ee34a228777d00ff328ef1c53cb1df1 /src/daemon/jsondbsignals.cpp | |
| parent | 20549eedb5b5e852c0e384cd76bfbff14168dbda (diff) | |
| parent | 7ef36e3c5a88560eb4e3a81c2c9f14059739108b (diff) | |
Merge remote-tracking branch 'gerrit/master' into hbtreehbtree
Conflicts:
src/daemon/daemon.pri
src/daemon/jsondbview.cpp
src/partition/jsondbindex.cpp
src/partition/jsondbindex.h
src/partition/jsondbindexquery.h
src/partition/jsondbmanagedbtree.cpp
src/partition/jsondbmanagedbtree.h
src/partition/jsondbmanagedbtreetxn.cpp
src/partition/jsondbmanagedbtreetxn.h
src/partition/jsondbobjecttable.cpp
src/partition/jsondbobjecttable.h
src/partition/jsondbpartition.cpp
src/partition/jsondbpartition.h
tests/auto/auto.pro
tests/auto/partition/testpartition.cpp
tests/benchmarks/benchmarks.pro
Change-Id: I963adefd6d32fca9b3537981306b67538c759034
Diffstat (limited to 'src/daemon/jsondbsignals.cpp')
| -rw-r--r-- | src/daemon/jsondbsignals.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/daemon/jsondbsignals.cpp b/src/daemon/jsondbsignals.cpp index c27b5f4..15ef8b1 100644 --- a/src/daemon/jsondbsignals.cpp +++ b/src/daemon/jsondbsignals.cpp @@ -119,5 +119,3 @@ void JsonDbSignals::handleSig() } mNotifier->setEnabled(true); } - - |