Merge lp://staging/~townsend/unity/fix-lp886478-trusty into lp://staging/unity/7.2
Proposed by
Christopher Townsend
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Stephen M. Webb | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 3821 | ||||
Proposed branch: | lp://staging/~townsend/unity/fix-lp886478-trusty | ||||
Merge into: | lp://staging/unity/7.2 | ||||
Diff against target: |
120 lines (+49/-2) 3 files modified
launcher/SwitcherView.cpp (+2/-1) unity-shared/StaticCairoText.cpp (+42/-1) unity-shared/StaticCairoText.h (+5/-0) |
||||
To merge this branch: | bzr merge lp://staging/~townsend/unity/fix-lp886478-trusty | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stephen M. Webb (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+259283@code.staging.launchpad.net |
Commit message
Add the possibility to specify the font size and the font weight without chaning the default font name.
To post a comment you must log in.
PASSED: Continuous integration, rev:3821 jenkins. qa.ubuntu. com/job/ unity-7. 2-ci/11/ jenkins. qa.ubuntu. com/job/ unity-7. 2-trusty- amd64-ci/ 11 jenkins. qa.ubuntu. com/job/ unity-7. 2-trusty- armhf-ci/ 11 jenkins. qa.ubuntu. com/job/ unity-7. 2-trusty- i386-ci/ 11
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- 7.2-ci/ 11/rebuild
http://