Merge lp:~unity-team/unity/x-sru1 into lp:unity

Proposed by Marco Trevisan (Treviño) on 2016-05-25
Status: Superseded
Proposed branch: lp:~unity-team/unity/x-sru1
Merge into: lp:unity
Diff against target: 52 lines (+37/-0) (has conflicts)
1 file modified
debian/changelog (+37/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~unity-team/unity/x-sru1
Reviewer Review Type Date Requested Status
Unity Team 2016-05-25 Pending
Review via email: mp+295778@code.launchpad.net

Commit message

Releasing unity SRU1 for Xenial

To post a comment you must log in.
lp:~unity-team/unity/x-sru1 updated on 2016-05-26
4118. By Marco Trevisan (Treviño) on 2016-05-26

debian/changelog: set proper version manually

Unmerged revisions

4118. By Marco Trevisan (Treviño) on 2016-05-26

debian/changelog: set proper version manually

4117. By handsome_feng on 2016-05-17

Change the x_offset of expo when launcher position changed.

4116. By Marco Trevisan (Treviño) on 2016-05-17

DashStyle: ensure LazyLoadTexture disconnects from signals on destruction

4115. By Marco Trevisan (Treviño) on 2016-05-17

SwitcherController: don't try to get a window from empty selections

4114. By Marco Trevisan (Treviño) on 2016-05-17

UnityScreen, UnityWindow: cleanup a little the code, and ensure overridden CompositeWindow functions get actually called There would be still a lot to do in this scenario, but still a start...F

4113. By Marco Trevisan (Treviño) on 2016-05-17

SwitcherView: close the mouse-selected application on middle-click

4112. By Andrea Azzarone on 2016-05-17

Do not reset the shortcut for icons that have their own shortcut.

4111. By Andrea Azzarone on 2016-05-17

Fallback to background class in case no background is specified for title bars and top panel.

4110. By Andrea Azzarone on 2016-05-17

Properly calculate array indexes to avoid crashes.

4109. By Andrea Azzarone on 2016-05-17

GnomeKeyGrabber: do not activate an action if it's a repeated one.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
=== modified file 'debian/changelog'
--- debian/changelog 2016-05-17 02:56:22 +0000
+++ debian/changelog 2016-05-25 23:43:22 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1unity (7.5.0+16.10.20160517-0ubuntu1) yakkety; urgency=medium2unity (7.5.0+16.10.20160517-0ubuntu1) yakkety; urgency=medium
23
3 [ Marco Trevisan (Treviño) ]4 [ Marco Trevisan (Treviño) ]
@@ -33,6 +34,42 @@
3334
34 -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 17 May 2016 02:56:22 +000035 -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 17 May 2016 02:56:22 +0000
3536
37=======
38unity (7.4.0-0ubuntu1) UNRELEASED; urgency=medium
39
40 [ Marco Trevisan (Treviño) ]
41 * Releasing Unity 7.4.0
42
43 [ Andrea Azzarone ]
44 * Properly remove SoftwareCenterLauncherIcon in case of failure. (LP:
45 #1553165)
46 * Update ExpoLauncherIcon in case the quicklist is used to switch vp.
47 (LP: #1525685)
48 * GnomeKeyGrabber: do not activate an action if it's a repeated one.
49 (LP: #1572241)
50 * Properly calculate array indexes to avoid crashes. (LP: #1570843)
51 * Fallback to "background" class in case no background is specified
52 for title bars and top panel. (LP: #1575527)
53 * Do not reset the shortcut for icons that have their own shortcut.
54 (LP: #1562847)
55
56 [ Marco Trevisan (Treviño) ]
57 * SwitcherView: close the mouse-selected application on middle-click
58 (LP: #1574689)
59 * UnityScreen, UnityWindow: cleanup a little the code, and ensure
60 overridden CompositeWindow functions get actually called
61 * SwitcherController: don't try to get a window from empty selections
62 (LP: #1580211)
63 * DashStyle: ensure LazyLoadTexture disconnects from signals on
64 destruction (LP: #1580212)
65
66 [ handsome_feng ]
67 * Change the x_offset of expo when launcher position changed. (LP:
68 #1562348, LP: #1573897)
69
70 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Sun, 15 May 2016 01:00:09 +0200
71
72>>>>>>> MERGE-SOURCE
36unity (7.4.0+16.04.20160415-0ubuntu1) xenial; urgency=medium73unity (7.4.0+16.04.20160415-0ubuntu1) xenial; urgency=medium
3774
38 [ Andrea Azzarone ]75 [ Andrea Azzarone ]