← Back to branch summary

~mc-return/compiz/compiz.merge-src-header-files-cleanup

~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to plugins/composite/src/composite.cpp

Committer: MC Return
Date: 2013-06-20 05:56:13 UTC
mfrom: (3724.2.16 0.9.10)
Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu

Merged latest lp:compiz and fixed conflicts

files modified:
cmake/CompizCommon.cmake

gtk/window-decorator/metacity.c

gtk/window-decorator/tests/test_gwd_settings.cpp

include/core/abiversion.h

include/core/plugin.h

plugins/animation/src/animation.cpp

plugins/composite/src/composite.cpp

plugins/cube/src/cube.cpp

plugins/expo/src/click_threshold/include/click-threshold.h

plugins/expo/src/click_threshold/src/click-threshold.cpp

plugins/expo/src/expo.cpp

plugins/expo/src/expo.h

plugins/expo/src/glow.cpp

plugins/expo/src/glow.h

plugins/expo/src/wall_offset/src/wall-offset.cpp

plugins/fade/src/fade.cpp

plugins/fade/src/fade.h

plugins/opacify/src/opacify.cpp

plugins/opacify/src/opacify.h

plugins/opengl/src/opengl.cpp

plugins/opengl/src/window.cpp

plugins/scale/src/scale.cpp

plugins/staticswitcher/src/staticswitcher.cpp

plugins/titleinfo/src/titleinfo.cpp

plugins/widget/src/widget.cpp

plugins/widget/src/widget.h

src/output.cpp

src/outputdevices.cpp

src/outputdevices.h

src/outputdevices_x11.cpp

src/plugin.cpp

src/plugin/tests/test-plugin.cpp

src/pluginclasshandler/include/core/pluginclasshandler.h

src/pluginclasshandler/tests/construct/src/test-pch-construct.cpp

src/pluginclasshandler/tests/get/src/test-pch-get.cpp

src/pluginclasshandler/tests/test-pluginclasshandler.h

src/privatescreen/tests/test-privatescreen.cpp

src/window.cpp

Show diffs side-by-side

added added

removed removed

plugins/composite/src/composite.cpp

33

33

34

34

35

35

class CompositePluginVTable :

36

public CompPlugin::VTableForScreenAndWindow<CompositeScreen, CompositeWindow>

36

public CompPlugin::VTableForScreenAndWindow<CompositeScreen, CompositeWindow, COMPIZ_COMPOSITE_ABI>

37

37

{

38

38

public:

39

39

Older »