Merge lp:~brandontschaefer/unity/lp.1350052-fix into lp:unity
Proposed by
Brandon Schaefer
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Marco Trevisan (Treviño) | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 3845 | ||||
Proposed branch: | lp:~brandontschaefer/unity/lp.1350052-fix | ||||
Merge into: | lp:unity | ||||
Diff against target: |
672 lines (+17/-111) 34 files modified
UnityCore/CheckOptionFilter.cpp (+0/-3) UnityCore/Filter.cpp (+0/-3) UnityCore/MultiRangeFilter.cpp (+0/-3) UnityCore/MusicPreview.cpp (+0/-1) UnityCore/RadioOptionFilter.cpp (+0/-3) UnityCore/Scope.cpp (+6/-0) UnityCore/Scope.h (+2/-7) dash/ScopeBar.cpp (+0/-2) dash/previews/ActionButton.cpp (+0/-2) dash/previews/PreviewContainer.cpp (+0/-2) dash/previews/PreviewInfoHintWidget.cpp (+0/-2) dash/previews/PreviewNavigator.cpp (+0/-2) dash/previews/SocialPreviewComments.cpp (+0/-2) dash/previews/SocialPreviewContent.cpp (+0/-2) dash/previews/Track.cpp (+0/-2) decorations/DecoratedWindow.cpp (+0/-2) decorations/DecorationsInputMixer.cpp (+0/-5) decorations/DecorationsManager.cpp (+0/-3) hud/HudButton.cpp (+0/-2) launcher/LauncherHideMachine.cpp (+0/-4) launcher/SimpleLauncherIcon.cpp (+0/-4) launcher/VolumeLauncherIcon.cpp (+0/-2) panel/PanelController.cpp (+0/-2) panel/PanelView.cpp (+0/-3) plugins/unityshell/src/unityshell.cpp (+6/-0) tests/test_glib_object.cpp (+0/-5) tests/test_icon_loader.cpp (+0/-9) tests/test_result_renderer.cpp (+0/-23) unity-shared/OverlayWindowButtons.cpp (+1/-1) unity-shared/OverlayWindowButtons.h (+1/-1) unity-shared/StandaloneAppManager.cpp (+0/-2) unity-shared/StandaloneWindowManager.cpp (+0/-3) unity-shared/TextureCache.cpp (+0/-2) unity-shared/UBusServer.cpp (+1/-2) |
||||
To merge this branch: | bzr merge lp:~brandontschaefer/unity/lp.1350052-fix | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+228781@code.launchpad.net |
Commit message
Fixes FTBFS caused by gcc 4.9. Mostly unused functions.
Description of the change
Fixes FTBFS caused by gcc 4.9. Mostly unused functions.
To post a comment you must log in.
PASSED: Continuous integration, rev:3845 jenkins. qa.ubuntu. com/job/ unity-ci/ 1037/ jenkins. qa.ubuntu. com/job/ unity-utopic- amd64-ci/ 124 jenkins. qa.ubuntu. com/job/ unity-utopic- armhf-ci/ 124 jenkins. qa.ubuntu. com/job/ unity-utopic- i386-ci/ 124
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- ci/1037/ rebuild
http://