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
1=== modified file 'CMakeLists.txt'
2=== modified file 'debian/changelog'
3--- debian/changelog 2016-05-17 02:56:22 +0000
4+++ debian/changelog 2016-05-25 23:43:22 +0000
5@@ -1,3 +1,4 @@
6+<<<<<<< TREE
7 unity (7.5.0+16.10.20160517-0ubuntu1) yakkety; urgency=medium
8
9 [ Marco Trevisan (Treviño) ]
10@@ -33,6 +34,42 @@
11
12 -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 17 May 2016 02:56:22 +0000
13
14+=======
15+unity (7.4.0-0ubuntu1) UNRELEASED; urgency=medium
16+
17+ [ Marco Trevisan (Treviño) ]
18+ * Releasing Unity 7.4.0
19+
20+ [ Andrea Azzarone ]
21+ * Properly remove SoftwareCenterLauncherIcon in case of failure. (LP:
22+ #1553165)
23+ * Update ExpoLauncherIcon in case the quicklist is used to switch vp.
24+ (LP: #1525685)
25+ * GnomeKeyGrabber: do not activate an action if it's a repeated one.
26+ (LP: #1572241)
27+ * Properly calculate array indexes to avoid crashes. (LP: #1570843)
28+ * Fallback to "background" class in case no background is specified
29+ for title bars and top panel. (LP: #1575527)
30+ * Do not reset the shortcut for icons that have their own shortcut.
31+ (LP: #1562847)
32+
33+ [ Marco Trevisan (Treviño) ]
34+ * SwitcherView: close the mouse-selected application on middle-click
35+ (LP: #1574689)
36+ * UnityScreen, UnityWindow: cleanup a little the code, and ensure
37+ overridden CompositeWindow functions get actually called
38+ * SwitcherController: don't try to get a window from empty selections
39+ (LP: #1580211)
40+ * DashStyle: ensure LazyLoadTexture disconnects from signals on
41+ destruction (LP: #1580212)
42+
43+ [ handsome_feng ]
44+ * Change the x_offset of expo when launcher position changed. (LP:
45+ #1562348, LP: #1573897)
46+
47+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Sun, 15 May 2016 01:00:09 +0200
48+
49+>>>>>>> MERGE-SOURCE
50 unity (7.4.0+16.04.20160415-0ubuntu1) xenial; urgency=medium
51
52 [ Andrea Azzarone ]