lp://qastaging/~unity-team/unity/x-sru6
Created by
Marco Trevisan (TreviƱo)
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- Andrea Azzarone (community): Approve
-
Diff: 233 lines (+50/-51)8 files modifieddebian/changelog (+10/-0)
decorations/DecoratedWindow.cpp (+3/-1)
hud/HudController.cpp (+1/-1)
launcher/CairoBaseWindow.cpp (+8/-3)
launcher/EdgeBarrierController.cpp (+21/-36)
launcher/EdgeBarrierControllerPrivate.h (+1/-4)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp (+1/-1)
plugins/unityshell/src/unityshell.cpp (+5/-5)
Superseded
for merging
into
lp://qastaging/unity
- Unity Team: Pending requested
-
Diff: 9045 lines (+6157/-2465) (has conflicts)25 files modifiedAUTHORS (+2/-0)
CMakeLists.txt (+5/-0)
ChangeLog (+5502/-2418)
UnityCore/GLibSignal.h (+4/-0)
dash/ResultRendererTile.cpp (+6/-0)
data/CMakeLists.txt (+40/-0)
debian/changelog (+250/-0)
debian/control (+4/-0)
debian/libunity-core-6.0-9.install (+5/-0)
debian/rules (+6/-0)
debian/unity-services.install (+4/-0)
debian/unity.install (+7/-0)
debian/unity.migrations (+4/-0)
hud/HudController.cpp (+1/-1)
launcher/EdgeBarrierController.cpp (+21/-36)
launcher/EdgeBarrierControllerPrivate.h (+1/-4)
lockscreen/LockScreenController.cpp (+8/-0)
lockscreen/LockScreenController.h (+4/-0)
plugins/unityshell/src/unityshell.cpp (+7/-3)
services/unity-panel-service-lockscreen.service.in (+10/-0)
tests/CMakeLists.txt (+157/-0)
tests/test_lockscreen_controller.cpp (+12/-0)
tools/CMakeLists.txt (+35/-0)
unity-shared/UnitySettings.cpp (+51/-3)
unity-shared/UpstartWrapper.cpp (+11/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/unity