Merge lp://staging/~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3 into lp://staging/ubuntu/trusty/xfce4-session
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Merged at revision: | 75 |
| Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3 |
| Merge into: | lp://staging/ubuntu/trusty/xfce4-session |
| Diff against target: |
413 lines (+291/-9) 14 files modified
.pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in (+192/-0) .pc/applied-patches (+1/-0) .pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in (+1/-1) debian/55xfce4-session (+18/-0) debian/changelog (+53/-0) debian/control (+3/-3) debian/defaults.list (+1/-0) debian/patches/01_fix-xrdb-call.patch (+11/-0) debian/patches/series (+1/-0) debian/rules (+4/-4) debian/xfce4-session.dirs (+2/-0) debian/xfce4-session.install (+2/-0) debian/xfce4-session.links (+1/-0) scripts/xinitrc.in.in (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
