Merge lp://qastaging/~mterry/qtmir/gles-testing into lp://qastaging/qtmir

Proposed by Michael Terry
Status: Superseded
Proposed branch: lp://qastaging/~mterry/qtmir/gles-testing
Merge into: lp://qastaging/qtmir
Diff against target: 785 lines (+738/-0) (has conflicts)
9 files modified
debian/changelog (+568/-0)
debian/compat (+1/-0)
debian/control (+70/-0)
debian/copyright (+48/-0)
debian/docs (+1/-0)
debian/qtmir-android.install (+1/-0)
debian/rules (+36/-0)
debian/tests/control (+3/-0)
debian/tests/run-tests (+10/-0)
Conflict adding file debian.  Moved existing file to debian.moved.
To merge this branch: bzr merge lp://qastaging/~mterry/qtmir/gles-testing
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+279336@code.qastaging.launchpad.net

Commit message

Testing

Description of the change

Testing

To post a comment you must log in.

Unmerged revisions

137. By Michael Terry

Testing

136. By Timo Jyrinki

Rebuild against Qt 5.5.1.

135. By CI Train Bot Account

Releasing 0.4.6+16.04.20151125-0ubuntu1

134. By MichaƂ Sawicz

New release

133. By CI Train Bot Account

Releasing 0.4.6+16.04.20151119-0ubuntu1

132. By kevin gunn

Sync with trunk

131. By CI Train Bot Account

Releasing 0.4.6+16.04.20151113-0ubuntu1

130. By CI Train Bot Account

Sync with trunk

129. By CI Train Bot Account

Releasing 0.4.6+16.04.20151112-0ubuntu1

128. By CI Train Bot Account

Sync with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches