Merge lp://qastaging/~noskcaj/ubuntu/trusty/gtk2-engines-oxygen/1.4.0 into lp://qastaging/ubuntu/trusty/gtk2-engines-oxygen
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/gtk2-engines-oxygen/1.4.0 |
| Merge into: | lp://qastaging/ubuntu/trusty/gtk2-engines-oxygen |
| Diff against target: |
3088 lines (+1109/-549) 49 files modified
.pc/applied-patches (+0/-1) .pc/dont-build-demos.patch/CMakeLists.txt (+0/-202) CMakeLists.txt (+5/-5) debian/changelog (+17/-0) debian/patches/dont-build-demos.patch (+1/-1) demo/CMakeLists.txt (+6/-1) demo/oxygengtkdeco_main.cpp (+2/-1) drag.patch (+143/-0) empty_areas.patch (+0/-17) src/CMakeLists.txt (+2/-0) src/animations/oxygenanimations.cpp (+3/-1) src/animations/oxygenbackgroundhintengine.cpp (+29/-0) src/animations/oxygenbackgroundhintengine.h (+17/-7) src/animations/oxygenhoverengine.h (+5/-1) src/animations/oxygeninnershadowdata.cpp (+5/-10) src/animations/oxygeninnershadowdata.h (+3/-3) src/animations/oxygenmenubarstatedata.h (+4/-2) src/animations/oxygenmenustatedata.h (+4/-2) src/animations/oxygentoolbarstatedata.h (+4/-2) src/animations/oxygenwidgetsizedata.cpp (+106/-0) src/animations/oxygenwidgetsizedata.h (+9/-18) src/animations/oxygenwidgetsizeengine.h (+3/-10) src/animations/oxygenwidgetstateengine.h (+1/-0) src/oxygenapplicationname.cpp (+7/-1) src/oxygenapplicationname.h (+7/-1) src/oxygencachekey.h (+35/-0) src/oxygencairoutils.cpp (+41/-2) src/oxygencairoutils.h (+3/-0) src/oxygencolorutils.cpp (+1/-1) src/oxygengtkcellinfo.cpp (+1/-1) src/oxygengtkutils.cpp (+26/-2) src/oxygengtkutils.h (+15/-6) src/oxygenoption.cpp (+40/-0) src/oxygenoption.h (+3/-0) src/oxygenqtsettings.cpp (+53/-25) src/oxygenqtsettings.h (+18/-0) src/oxygenshadowhelper.cpp (+27/-4) src/oxygenshadowhelper.h (+6/-0) src/oxygenstyle.cpp (+153/-27) src/oxygenstyle.h (+22/-4) src/oxygenstylehelper.cpp (+51/-5) src/oxygenstylehelper.h (+6/-0) src/oxygenstyleoptions.h (+2/-1) src/oxygenstylewrapper.cpp (+39/-97) src/oxygentileset.cpp (+14/-4) src/oxygenwindecooptions.h (+1/-0) src/oxygenwindowmanager.cpp (+127/-73) src/oxygenwindowmanager.h (+40/-9) src/oxygenwindowshadow.cpp (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/gtk2-engines-oxygen/1.4.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian
To post a comment you must log in.
Unmerged revisions
- 28. By Jackson Doak
-
Merge with debian, remaining changes: \n - Fix dh_shlibdeps to exclude libgtk2.0-0 from Depends
- 27. By Jackson Doak
-
Merging shared upstream rev into target branch.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.