Compiz Core

Merge lp://qastaging/~vanvugt/compiz-core/revert-lim into lp://qastaging/compiz-core

Proposed by Daniel van Vugt on 2012-03-30

Status:	Merged
Approved by:	Sam Spilsbury on 2012-03-30
Approved revision:	3077
Merged at revision:	3077
Proposed branch:	lp://qastaging/~vanvugt/compiz-core/revert-lim
Merge into:	lp://qastaging/compiz-core
Diff against target:	1601 lines (+11/-1218) 16 files modified gtk/window-decorator/CMakeLists.txt (+0/-6) gtk/window-decorator/decorator.c (+6/-32) gtk/window-decorator/events.c (+3/-117) gtk/window-decorator/gtk-window-decorator.c (+0/-59) gtk/window-decorator/gtk-window-decorator.h (+1/-8) gtk/window-decorator/local-menus/CMakeLists.txt (+0/-60) gtk/window-decorator/local-menus/src/local-menus.c (+0/-438) gtk/window-decorator/local-menus/src/local-menus.h (+0/-125) gtk/window-decorator/local-menus/tests/CMakeLists.txt (+0/-3) gtk/window-decorator/local-menus/tests/check_local_menu_on_off/CMakeLists.txt (+0/-21) gtk/window-decorator/local-menus/tests/check_local_menu_on_off/test-local-menu-on-off.cpp (+0/-47) gtk/window-decorator/local-menus/tests/force_local_menu_on/CMakeLists.txt (+0/-21) gtk/window-decorator/local-menus/tests/force_local_menu_on/test-force-local-menu-on.cpp (+0/-89) gtk/window-decorator/local-menus/tests/test-local-menu.h (+0/-106) gtk/window-decorator/metacity.c (+0/-54) gtk/window-decorator/wnck.c (+1/-32)
To merge this branch:	bzr merge lp://qastaging/~vanvugt/compiz-core/revert-lim
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Sam Spilsbury	2012-03-30	Approve on 2012-03-30
Didier Roche-Tolomelli	2012-03-30	Approve on 2012-03-30
Review via email: mp+100079@code.qastaging.launchpad.net