Merge lp://qastaging/~noskcaj/ubuntu/trusty/xfwm4/4.11 into lp://qastaging/ubuntu/trusty/xfwm4
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/xfwm4/4.11 |
Merge into: | lp://qastaging/ubuntu/trusty/xfwm4 |
Diff against target: |
99826 lines (+21489/-59611) 111 files modified
.pc/0004-Optimize-smart-placement-bug-5785.patch/src/placement.c (+0/-952) .pc/8563.patch/src/client.c (+0/-3926) .pc/applied-patches (+0/-2) ChangeLog (+2037/-343) INSTALL (+1/-1) Makefile.in (+63/-26) NEWS (+36/-12) aclocal.m4 (+204/-106) config.guess (+87/-64) config.h.in (+3/-3) config.sub (+14/-16) configure (+532/-207) configure.ac (+15/-6) debian/changelog (+26/-0) debian/control (+3/-3) debian/patches/0004-Optimize-smart-placement-bug-5785.patch (+0/-217) debian/patches/8563.patch (+7/-5) debian/patches/series (+0/-2) defaults/Makefile.in (+49/-17) defaults/defaults (+1/-0) depcomp (+2/-1) helper-dialog/Makefile.in (+52/-19) icons/22x22/Makefile.in (+49/-17) icons/48x48/Makefile.in (+49/-17) icons/Makefile.in (+55/-24) icons/scalable/Makefile.in (+49/-17) po/ar.po (+314/-1082) po/ast.po (+106/-430) po/az.po (+0/-1613) po/be.po (+298/-407) po/bg.po (+299/-584) po/bn.po (+99/-410) po/bn_IN.po (+0/-1606) po/ca.po (+296/-1136) po/cs.po (+296/-1124) po/da.po (+297/-604) po/de.po (+292/-1200) po/dz.po (+0/-1732) po/el.po (+304/-618) po/en_AU.po (+752/-0) po/en_GB.po (+300/-1066) po/es.po (+298/-1143) po/es_MX.po (+0/-1627) po/eu.po (+298/-991) po/fa.po (+0/-1614) po/fi.po (+301/-586) po/fr.po (+300/-619) po/gl.po (+292/-611) po/gu.po (+0/-1622) po/he.po (+293/-303) po/hi.po (+0/-1414) po/hr.po (+291/-576) po/hu.po (+299/-607) po/id.po (+321/-1162) po/is.po (+170/-448) po/it.po (+299/-626) po/ja.po (+98/-384) po/ka.po (+0/-1018) po/kk.po (+293/-598) po/ko.po (+319/-591) po/lt.po (+296/-577) po/lv.po (+108/-993) po/mk.po (+0/-1773) po/mr.po (+0/-1621) po/ms.po (+222/-1048) po/nb.po (+102/-414) po/nl.po (+298/-1077) po/nn.po (+293/-577) po/oc.po (+752/-0) po/pl.po (+302/-1052) po/pt.po (+297/-583) po/pt_BR.po (+301/-1120) po/ro.po (+294/-592) po/ru.po (+152/-434) po/sk.po (+301/-1078) po/sq.po (+107/-922) po/sr.po (+296/-573) po/sv.po (+295/-1069) po/ta.po (+0/-1570) po/th.po (+752/-0) po/tr.po (+295/-1070) po/ug.po (+293/-562) po/uk.po (+295/-605) po/ur.po (+104/-598) po/ur_PK.po (+104/-598) po/zh_CN.po (+299/-579) po/zh_HK.po (+755/-0) po/zh_TW.po (+301/-592) settings-dialogs/Makefile.in (+54/-19) settings-dialogs/tweaks-settings.c (+14/-0) settings-dialogs/xfwm4-dialog.glade (+412/-198) settings-dialogs/xfwm4-dialog_ui.h (+688/-568) settings-dialogs/xfwm4-settings.c (+149/-119) settings-dialogs/xfwm4-tweaks-dialog.glade (+239/-92) settings-dialogs/xfwm4-tweaks-dialog_ui.h (+627/-535) settings-dialogs/xfwm4-workspace-dialog.glade (+14/-8) settings-dialogs/xfwm4-workspace-dialog_ui.h (+78/-78) src/Makefile.am (+2/-1) src/Makefile.in (+54/-20) src/client.c (+6/-10) src/compositor.c (+386/-28) src/compositor.h (+4/-0) src/events.c (+12/-10) src/screen.h (+17/-0) src/settings.c (+8/-1) src/settings.h (+1/-0) themes/Makefile.in (+55/-24) themes/daloa/Makefile.in (+49/-17) themes/default/Makefile.in (+49/-17) themes/kokodi/Makefile.in (+49/-17) themes/moheli/Makefile.in (+49/-17) |
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/xfwm4/4.11 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email:
|
Description of the change
Merge from debian experimental, needed for xubuntu
To post a comment you must log in.
Unmerged revisions
- 69. By Jackson Doak
-
* Merge from Debian unstable. Remaining changes:
- debian/control: demote xfwm4-themes from Recommends to Suggests, per
the 'other-p-xubuntu- cleanthemes' spec.
- Add patch from XFCE bugzilla to fix fullscreen behavior with Qt
based apps
Thanks. Uploaded.