Merge lp://qastaging/~unity-team/unity/x-sru2 into lp://qastaging/unity/7.4
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged |
|---|---|
| Approved by: | Andrea Azzarone |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 4109 |
| Proposed branch: | lp://qastaging/~unity-team/unity/x-sru2 |
| Merge into: | lp://qastaging/unity/7.4 |
| Diff against target: |
3147 lines (+1049/-409) 58 files modified
UnityCore/GnomeSessionManager.cpp (+2/-1) com.canonical.Unity.gschema.xml (+38/-0) dash/DashController.cpp (+6/-2) dash/DashView.cpp (+14/-10) dash/StandaloneDash.cpp (+1/-1) dash/previews/PreviewContainer.cpp (+35/-76) dash/previews/PreviewContainer.h (+4/-9) dash/previews/StandaloneApplicationPreview.cpp (+5/-0) dash/previews/StandaloneErrorPreview.cpp (+5/-0) dash/previews/StandaloneMoviePreview.cpp (+5/-0) dash/previews/StandaloneMusicPaymentPreview.cpp (+5/-0) dash/previews/StandaloneSocialPreview.cpp (+5/-0) debian/changelog (+47/-0) debian/unity7.conf (+11/-6) hud/HudController.cpp (+5/-2) launcher/ApplicationLauncherIcon.cpp (+2/-4) launcher/ApplicationLauncherIcon.h (+3/-0) launcher/CairoBaseWindow.cpp (+6/-2) launcher/FileManagerLauncherIcon.cpp (+8/-0) launcher/Launcher.cpp (+44/-32) launcher/LauncherController.cpp (+2/-6) launcher/LauncherControllerPrivate.h (+0/-1) launcher/SwitcherController.cpp (+6/-1) launcher/SwitcherView.cpp (+3/-0) launcher/VolumeImp.cpp (+4/-1) lockscreen/CMakeLists.txt (+1/-0) lockscreen/LockScreenAcceleratorController.cpp (+167/-148) lockscreen/LockScreenAcceleratorController.h (+8/-3) lockscreen/LockScreenAccelerators.cpp (+5/-0) lockscreen/LockScreenAccelerators.h (+3/-1) lockscreen/LockScreenButton.cpp (+148/-0) lockscreen/LockScreenButton.h (+70/-0) lockscreen/LockScreenController.cpp (+9/-3) lockscreen/LockScreenController.h (+3/-1) lockscreen/UserAuthenticatorPam.cpp (+14/-5) lockscreen/UserPromptView.cpp (+113/-13) lockscreen/UserPromptView.h (+9/-1) panel/PanelView.cpp (+16/-11) plugins/unityshell/src/UnityShowdesktopHandler.cpp (+4/-3) plugins/unityshell/src/unityshell.cpp (+40/-20) plugins/unityshell/src/unityshell.h (+6/-0) shortcuts/ShortcutController.cpp (+7/-1) shutdown/SessionController.cpp (+7/-2) tests/test_lockscreen_controller.cpp (+8/-4) unity-shared/BGHash.cpp (+6/-1) unity-shared/BGHash.h (+1/-1) unity-shared/BackgroundEffectHelper.cpp (+1/-1) unity-shared/DashStyle.cpp (+39/-0) unity-shared/DashStyle.h (+5/-0) unity-shared/GnomeKeyGrabber.cpp (+32/-6) unity-shared/GnomeKeyGrabberImpl.h (+8/-1) unity-shared/KeyGrabber.h (+4/-0) unity-shared/OverlayRenderer.cpp (+6/-6) unity-shared/PlacesOverlayVScrollBar.cpp (+2/-1) unity-shared/SpreadFilter.cpp (+5/-1) unity-shared/UnitySettings.cpp (+29/-18) unity-shared/UnitySettings.h (+6/-2) unity-shared/UnityWindowView.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~unity-team/unity/x-sru2 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrea Azzarone (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Releasing SRU2 for Xenial
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good thanks.