Merge lp:~kevin-wright-1/u1db-qt/example-3-development-march-11-2013-iii into lp:u1db-qt
Proposed by
Kevin Wright
Status: | Merged |
---|---|
Merged at revision: | 43 |
Proposed branch: | lp:~kevin-wright-1/u1db-qt/example-3-development-march-11-2013-iii |
Merge into: | lp:u1db-qt |
Diff against target: |
183 lines (+86/-21) (has conflicts) 1 file modified
examples/u1db-qt-example-3.qml (+86/-21) Text conflict in examples/u1db-qt-example-3.qml |
To merge this branch: | bzr merge lp:~kevin-wright-1/u1db-qt/example-3-development-march-11-2013-iii |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cris Dywan | Approve | ||
Review via email: mp+152652@code.launchpad.net |
Description of the change
Improved u1db-qt-
To post a comment you must log in.