Merge lp://qastaging/~compiz-team/compiz-core/oneiric.fix_796594-n into lp://qastaging/compiz-core/0.9.5
Proposed by
Sam Spilsbury
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~compiz-team/compiz-core/oneiric.fix_796594-n |
Merge into: | lp://qastaging/compiz-core/0.9.5 |
Diff against target: |
35527 lines (+11992/-11435) (has conflicts) 91 files modified
CMakeLists.txt (+2/-1) VERSION (+1/-1) gtk/CMakeLists.txt (+1/-1) gtk/config.h.gtk.in (+0/-25) gtk/gnome/CMakeLists.txt (+16/-1) gtk/gnome/compiz.desktop.in (+1/-1) gtk/window-decorator/actionmenu.c (+0/-133) gtk/window-decorator/blurprops.c (+0/-89) gtk/window-decorator/cairo.c (+0/-912) gtk/window-decorator/decorator.c (+0/-1436) gtk/window-decorator/decorprops.c (+0/-175) gtk/window-decorator/events.c (+0/-1177) gtk/window-decorator/forcequit.c (+0/-201) gtk/window-decorator/frames.c (+0/-316) gtk/window-decorator/gdk.c (+0/-106) gtk/window-decorator/gtk-window-decorator.c (+0/-467) gtk/window-decorator/gtk-window-decorator.h (+0/-1151) gtk/window-decorator/gwd.schemas.in (+0/-81) gtk/window-decorator/metacity.c (+0/-1638) gtk/window-decorator/settings.c (+0/-546) gtk/window-decorator/style.c (+0/-66) gtk/window-decorator/switcher.c (+0/-515) gtk/window-decorator/util.c (+0/-299) gtk/window-decorator/wnck.c (+0/-708) include/core/core.h (+4/-0) include/core/screen.h (+3/-1) include/core/window.h (+8/-2) include/decoration.h (+50/-59) kde/window-decorator-kde4/decorator.cpp (+6/-17) kde/window-decorator-kde4/decorator.h (+2/-19) kde/window-decorator-kde4/switcher.cpp (+5/-10) kde/window-decorator-kde4/utils.cpp (+2/-0) kde/window-decorator-kde4/window.cpp (+14/-110) kde/window-decorator-kde4/window.h (+1/-1) libdecoration/decoration.c (+85/-137) metadata/core.xml.in (+3/-3) plugins/bailer/CMakeLists.txt (+5/-0) plugins/bailer/bailer.xml.in (+82/-0) plugins/bailer/src/bailer.cpp (+277/-0) plugins/bailer/src/bailer.h (+86/-0) plugins/composite/include/composite/composite.h (+4/-0) plugins/cube/cube.xml.in (+7/-6) plugins/debugspew/CMakeLists.txt (+5/-0) plugins/debugspew/debugspew.xml.in (+24/-0) plugins/debugspew/src/debugspew.cpp (+637/-0) plugins/debugspew/src/debugspew.h (+55/-0) plugins/decor/decor.xml.in (+3/-2) plugins/decor/src/decor.cpp (+144/-916) plugins/decor/src/decor.h (+8/-35) plugins/detection/CMakeLists.txt (+5/-0) plugins/detection/detection.xml.in (+28/-0) plugins/detection/src/detection.cpp (+74/-0) plugins/detection/src/detection.h (+52/-0) plugins/fade/fade.xml.in (+2/-1) plugins/opengl/include/opengl/opengl.h (+4/-0) plugins/opengl/opengl.xml.in (+1/-1) plugins/opengl/src/screen.cpp (+14/-0) plugins/place/place.xml.in (+1/-1) plugins/resize/resize.xml.in (+8/-8) plugins/scale/scale.xml.in (+8/-10) src/main.cpp (+23/-0) src/privatescreen.h (+10/-1) src/privatewindow.h (+15/-5) src/screen.cpp (+52/-23) src/window.cpp (+387/-21) unity/unity_window_decorator/AUTHORS (+29/-0) unity/unity_window_decorator/CMakeLists.txt (+38/-0) unity/unity_window_decorator/COPYING (+6/-0) unity/unity_window_decorator/COPYING.GPL (+340/-0) unity/unity_window_decorator/INSTALL (+14/-0) unity/unity_window_decorator/README (+8/-0) unity/unity_window_decorator/src/CMakeLists.txt (+161/-0) unity/unity_window_decorator/src/TODO (+6/-0) unity/unity_window_decorator/src/actionmenu.c (+109/-0) unity/unity_window_decorator/src/blurprops.c (+68/-0) unity/unity_window_decorator/src/cairo.c (+1001/-0) unity/unity_window_decorator/src/config.h.gtk.in (+25/-0) unity/unity_window_decorator/src/decorator.c (+874/-0) unity/unity_window_decorator/src/decorprops.c (+150/-0) unity/unity_window_decorator/src/events.c (+1146/-0) unity/unity_window_decorator/src/forcequit.c (+176/-0) unity/unity_window_decorator/src/gdk.c (+87/-0) unity/unity_window_decorator/src/gtk-window-decorator.c (+443/-0) unity/unity_window_decorator/src/gtk-window-decorator.h (+1009/-0) unity/unity_window_decorator/src/gwd.schemas.in (+81/-0) unity/unity_window_decorator/src/metacity.c (+1943/-0) unity/unity_window_decorator/src/settings.c (+567/-0) unity/unity_window_decorator/src/style.c (+42/-0) unity/unity_window_decorator/src/switcher.c (+452/-0) unity/unity_window_decorator/src/util.c (+278/-0) unity/unity_window_decorator/src/wnck.c (+714/-0) Text conflict in include/core/core.h Text conflict in include/core/window.h Text conflict in plugins/decor/src/decor.cpp Text conflict in src/privatescreen.h Text conflict in src/privatewindow.h Text conflict in src/screen.cpp Text conflict in src/window.cpp |
To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz-core/oneiric.fix_796594-n |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Compiz Maintainers | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2011-09-29.
Description of the change
Fix bug 796594
To post a comment you must log in.
Unmerged revisions
- 2822. By Sam Spilsbury
-
Remove debug message
- 2821. By Sam Spilsbury
-
Make semi-maximized windows have maximized decorations
- 2820. By Sam Spilsbury
-
Merge r2845..2849 of lp:compiz-core
- 2819. By Sam Spilsbury
-
Merge
- 2818. By Sam Spilsbury
-
Merge -r2844..2845
- 2817. By Sam Spilsbury
-
Bump timeout
- 2816. By Sam Spilsbury
-
Fix merge error
- 2815. By Sam Spilsbury
-
Merge r2838..2844 of lp:compiz-core
- 2814. By Sam Spilsbury
-
Merge upstream -r2828..2833
- 2813. By Sam Spilsbury
-
Revert experimental code