diff options
| author | Aaron Seigo <aseigo@kde.org> | 2014-12-05 10:05:19 +0100 |
|---|---|---|
| committer | Aaron Seigo <aseigo@kde.org> | 2014-12-05 10:05:19 +0100 |
| commit | 93d1c82ffd17df45a5cecd875a01ee3cb15d9983 (patch) | |
| tree | cda5c31857362ce81f3a50959024f4270d149a07 /store/kyotodatabase.cpp | |
| parent | 639fc60c100204c87b93112516cf3b3117cfff0d (diff) | |
| parent | 351a66b5fb1c8659bff8ea20d60f5a6d2d3263ad (diff) | |
| download | sink-93d1c82ffd17df45a5cecd875a01ee3cb15d9983.tar.gz sink-93d1c82ffd17df45a5cecd875a01ee3cb15d9983.zip | |
Merge branch 'kyoto'
Conflicts:
common/storage.h
common/storage_lmdb.cpp
dummyresource/facade.cpp
store/test/CMakeLists.txt
tests/storagebenchmark.cpp
Diffstat (limited to 'store/kyotodatabase.cpp')
0 files changed, 0 insertions, 0 deletions