Merge lp://qastaging/~kalikiana/u1db-qt/trunk into lp://qastaging/u1db-qt
Proposed by
Cris Dywan
Status: | Merged |
---|---|
Approved by: | Cris Dywan |
Approved revision: | 70 |
Merged at revision: | 59 |
Proposed branch: | lp://qastaging/~kalikiana/u1db-qt/trunk |
Merge into: | lp://qastaging/u1db-qt |
Diff against target: |
1033 lines (+725/-84) 11 files modified
CMakeLists.txt (+5/-0) database.cpp (+14/-0) document.cpp (+1/-0) document.h (+4/-0) documentation/base.css (+638/-0) documentation/concepts.qdoc (+31/-84) documentation/u1db.qdocconf (+22/-0) index.cpp (+1/-0) index.h (+4/-0) query.cpp (+1/-0) query.h (+4/-0) |
To merge this branch: | bzr merge lp://qastaging/~kalikiana/u1db-qt/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cris Dywan | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+157141@code.qastaging.launchpad.net |
Commit message
Install docs into QtAssistant, add Ubuntu style and fix Concepts
Description of the change
Install docs into QtAssistant, add Ubuntu style and fix Concepts
To post a comment you must log in.
PASSED: Continuous integration, rev:70 91.189. 93.125: 8080/job/ u1db-qt- ci/8/ 91.189. 93.125: 8080/job/ u1db-qt- quantal- amd64-ci/ 8 91.189. 93.125: 8080/job/ u1db-qt- raring- amd64-ci/ 8
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.125: 8080/job/ u1db-qt- ci/8/rebuild
http://