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
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: