QtMir

Merge lp:~timo-jyrinki/qtmir/gles_sync_qt541 into lp:qtmir/gles

  1. gles_sync_qt541
  2. Merge into gles
Proposed by Timo Jyrinki
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 77
Merged at revision: 79
Proposed branch: lp:~timo-jyrinki/qtmir/gles_sync_qt541
Merge into: lp:qtmir/gles
Diff against target: 11 lines (+4/-0) (has conflicts)
1 file modified
debian/changelog (+4/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~timo-jyrinki/qtmir/gles_sync_qt541
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+252690@code.launchpad.net

Commit message

Sync with upstream (Qt 5.4.1 landing)

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

This goes with the https://code.launchpad.net/~aacid/qtmir/load_generic_sensors_test_5_4_1/+merge/251970 built in Qt 5.4.1 silo.

lp:~timo-jyrinki/qtmir/gles_sync_qt541 updated
78. By Timo Jyrinki

bump version

79. By Timo Jyrinki

do same dependency trickery as UITK

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-03-17 18:56:05 +0000
3+++ debian/changelog 2015-03-17 19:02:09 +0000
4@@ -1,4 +1,8 @@
5+<<<<<<< TREE
6 qtmir-gles (0.4.4+15.04.20150311-0ubuntu2) UNRELEASED; urgency=medium
7+=======
8+qtmir-gles (0.4.4+15.04.20150317-0ubuntu2) UNRELEASED; urgency=medium
9+>>>>>>> MERGE-SOURCE
10
11 * Sync with upstream
12

Subscribers

People subscribed via source and target branches