Merge lp://staging/~noskcaj/gnome-control-center/3.14 into lp://staging/~ubuntu-desktop/gnome-control-center/ubuntu

Proposed by Jackson Doak
Status: Merged
Merged at revision: 653
Proposed branch: lp://staging/~noskcaj/gnome-control-center/3.14
Merge into: lp://staging/~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 1186 lines (+451/-305)
12 files modified
debian/changelog (+102/-1)
debian/control (+6/-9)
debian/control.in (+5/-8)
debian/patches/30_stack_overflow.patch (+30/-0)
debian/patches/31_printers_border.patch (+25/-0)
debian/patches/52_region_language.patch (+52/-60)
debian/patches/56_use_ubuntu_info_branding.patch (+15/-9)
debian/patches/gcc_not_in_unity.patch (+182/-0)
debian/patches/revert_automatic_timezone.patch (+0/-105)
debian/patches/revert_git_dont_hide_zoom.patch (+0/-76)
debian/patches/series (+2/-2)
debian/patches/ubuntu_external_panels.patch (+32/-35)
To merge this branch: bzr merge lp://staging/~noskcaj/gnome-control-center/3.14
Reviewer Review Type Date Requested Status
Tim Lunn Approve
Ubuntu Desktop Pending
Review via email: mp+245273@code.staging.launchpad.net

Description of the change

Merge version 3.14 from debian.

To post a comment you must log in.
655. By Jackson Doak

Drop our revert_git_dont_hide_zoom.patch, no longer needed.

Revision history for this message
Tim Lunn (darkxst) wrote :

Thanks Jackson, Looks good.
Can confirm no changes to shared data

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