← Back to branch summary

~kalikiana/u1db-qt/hackingDocs

~kalikiana/u1db-qt/hackingDocs

Viewing all changes in revision 114.

Committer: Christian Dywan
Date: 2014-02-24 10:05:40 UTC
mfrom: (108.1.4 trunk)
Revision ID: christian.dywan@canonical.com-20140224100540-1u8jxmqbtgyik9i9

Merge lp:u1db-qt

files removed:
examples/u1db-qt-example-4/u1db-qt-example-4.qdoc

files renamed:
examples/u1db-qt-example-4/ => examples/bookmarks/

examples/u1db-qt-example-4/u1db-qt-example-4.qml => examples/bookmarks/bookmarks.qml

files modified:
CMakeLists.txt

examples/CMakeLists.txt

src/database.cpp

src/database.h

src/index.cpp

src/query.cpp

src/query.h

src/synchronizer.cpp

src/synchronizer.h

tests/CMakeLists.txt

tests/tst_query.qml

Show diffs side-by-side

added added

removed removed

examples/CMakeLists.txt

examples/bookmarks/bookmarks.qml

examples/u1db-qt-example-4/u1db-qt-example-4.qdoc

src/database.cpp

src/synchronizer.cpp

src/synchronizer.h

tests/CMakeLists.txt

tests/tst_query.qml

Older »