Merge lp://qastaging/~unity-team/compiz/x-sru1 into lp://qastaging/compiz/xenial
Proposed by
Marco Trevisan (Treviño)
| Status: | Merged | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Andrea Azzarone | ||||||||||||||||||||||||||||
| Approved revision: | 4017 | ||||||||||||||||||||||||||||
| Merged at revision: | 4011 | ||||||||||||||||||||||||||||
| Proposed branch: | lp://qastaging/~unity-team/compiz/x-sru1 | ||||||||||||||||||||||||||||
| Merge into: | lp://qastaging/compiz/xenial | ||||||||||||||||||||||||||||
| Diff against target: |
582 lines (+213/-37) 14 files modified
debian/changelog (+27/-0) include/core/screen.h (+3/-0) plugins/expo/expo.xml.in (+6/-0) plugins/expo/src/expo.cpp (+3/-1) plugins/opengl/src/paint.cpp (+1/-1) plugins/scale/include/scale/scale.h (+1/-1) plugins/scale/scale.xml.in (+7/-1) plugins/scale/src/privates.h (+2/-2) plugins/scale/src/scale.cpp (+83/-18) src/event.cpp (+29/-3) src/privatescreen.h (+7/-1) src/privatescreen/tests/test-privatescreen.cpp (+3/-0) src/screen.cpp (+26/-6) src/window.cpp (+15/-3) |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~unity-team/compiz/x-sru1 | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrea Azzarone | Approve | ||
|
Review via email:
|
|||
Commit message
Backported fixes for the first Xenial SRU
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
+1