← Back to branch summary

~mc-return/compiz/compiz0.9.9.merge-plugin-screensaver

~mc-return/compiz/compiz0.9.9.merge-plugin-screensaver

Viewing all changes in revision 3310.

Committer: MC Return
Date: 2013-05-12 17:08:44 UTC
mfrom: (3286.2.409 0.9.10)
Revision ID: mc.return@gmx.net-20130512170844-tye08w6gsyu32wox

Merged latest lp:compiz

files added:
tests/xorg-gtest/src/compiz_xorg_gtest_main.cpp

files modified:
debian/patches/100_workaround_virtualbox_hang.patch

debian/patches/ubuntu-config.patch

plugins/addhelper/src/addhelper.cpp

plugins/animation/src/animation.cpp

plugins/animationaddon/src/animationaddon.cpp

plugins/annotate/src/annotate.cpp

plugins/bench/src/bench.cpp

plugins/bicubic/src/bicubic.cpp

plugins/blur/src/blur.cpp

plugins/ccp/src/ccp.cpp

plugins/clone/src/clone.cpp

plugins/colorfilter/src/colorfilter.cpp

plugins/commands/src/commands.cpp

plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/composite/src/composite.cpp

plugins/copytex/src/copytex.cpp

plugins/crashhandler/src/crashhandler.cpp

plugins/cube/src/cube.cpp

plugins/cubeaddon/src/cubeaddon.cpp

plugins/dbus/src/dbus.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt

plugins/expo/src/expo.cpp

plugins/extrawm/src/extrawm.cpp

plugins/ezoom/src/ezoom.cpp

plugins/fade/src/fade.cpp

plugins/fadedesktop/src/fadedesktop.cpp

plugins/firepaint/src/firepaint.cpp

plugins/freewins/src/freewins.cpp

plugins/gears/src/gears.cpp

plugins/gnomecompat/src/gnomecompat.cpp

plugins/grid/grid.xml.in

plugins/grid/src/grid.cpp

plugins/grid/src/grid.h

plugins/group/src/init.cpp

plugins/imgjpeg/src/imgjpeg.cpp

plugins/imgpng/src/imgpng.cpp

plugins/imgsvg/src/imgsvg.cpp

plugins/inotify/src/inotify.cpp

plugins/kde/src/kde.cpp

plugins/kdecompat/src/kdecompat.cpp

plugins/loginout/src/loginout.cpp

plugins/mag/src/mag.cpp

plugins/maximumize/src/maximumize.cpp

plugins/mblur/src/mblur.cpp

plugins/mousepoll/src/mousepoll.cpp

plugins/move/src/move.cpp

plugins/neg/src/neg.cpp

plugins/notification/src/notification.cpp

plugins/obs/obs.xml.in

plugins/obs/src/obs.cpp

plugins/obs/src/obs.h

plugins/opacify/src/opacify.cpp

plugins/opengl/src/fsregion/fsregion.cpp

plugins/opengl/src/fsregion/fsregion.h

plugins/opengl/src/fsregion/tests/test-fsregion.cpp

plugins/opengl/src/opengl.cpp

plugins/opengl/src/paint.cpp

plugins/place/src/place.cpp

plugins/put/put.xml.in

plugins/put/src/put.cpp

plugins/put/src/put.h

plugins/reflex/src/reflex.cpp

plugins/regex/src/regex.cpp

plugins/resize/src/logic/src/resize-logic.cpp

plugins/resize/src/resize.cpp

plugins/resizeinfo/src/resizeinfo.cpp

plugins/ring/src/ring.cpp

plugins/rotate/src/rotate.cpp

plugins/scale/src/scale.cpp

plugins/scaleaddon/src/scaleaddon.cpp

plugins/scalefilter/src/scalefilter.cpp

plugins/screenshot/src/screenshot.cpp

plugins/session/src/session.cpp

plugins/shelf/src/shelf.cpp

plugins/shift/shift.xml.in

plugins/shift/src/shift.cpp

plugins/showdesktop/src/showdesktop.cpp

plugins/showmouse/src/showmouse.cpp

plugins/showrepaint/src/showrepaint.cpp

plugins/snap/src/snap.cpp

plugins/splash/src/splash.cpp

plugins/stackswitch/src/stackswitch.cpp

plugins/staticswitcher/src/staticswitcher.cpp

plugins/staticswitcher/src/staticswitcher.h

plugins/switcher/src/switcher.cpp

plugins/td/src/3d.cpp

plugins/text/src/text.cpp

plugins/thumbnail/src/thumbnail.cpp

plugins/titleinfo/src/titleinfo.cpp

plugins/trailfocus/src/trailfocus.cpp

plugins/trip/src/trip.cpp

plugins/vpswitch/src/vpswitch.cpp

plugins/wall/src/wall.cpp

plugins/wallpaper/src/wallpaper.cpp

plugins/water/src/water.cpp

plugins/widget/src/widget.cpp

plugins/winrules/src/winrules.cpp

plugins/wizard/src/wizard.cpp

plugins/wobbly/src/wobbly.cpp

plugins/workarounds/src/workarounds.cpp

plugins/workspacenames/src/workspacenames.cpp

tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt

tests/system/xorg-gtest/tests/CMakeLists.txt

tests/xorg-gtest/CMakeLists.txt

tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp

Show diffs side-by-side

added added

removed removed

debian/patches/100_workaround_virtualbox_hang.patch

debian/patches/ubuntu-config.patch

plugins/addhelper/src/addhelper.cpp

plugins/animation/src/animation.cpp

plugins/animationaddon/src/animationaddon.cpp

plugins/annotate/src/annotate.cpp

plugins/bench/src/bench.cpp

plugins/bicubic/src/bicubic.cpp

plugins/blur/src/blur.cpp

plugins/ccp/src/ccp.cpp

plugins/clone/src/clone.cpp

plugins/colorfilter/src/colorfilter.cpp

plugins/commands/src/commands.cpp

plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h

plugins/compiztoolbox/src/compiztoolbox.cpp

plugins/composite/src/composite.cpp

plugins/copytex/src/copytex.cpp

plugins/crashhandler/src/crashhandler.cpp

plugins/cube/src/cube.cpp

plugins/cubeaddon/src/cubeaddon.cpp

plugins/dbus/src/dbus.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt

plugins/expo/src/expo.cpp

plugins/extrawm/src/extrawm.cpp

plugins/ezoom/src/ezoom.cpp

plugins/fade/src/fade.cpp

plugins/fadedesktop/src/fadedesktop.cpp

plugins/firepaint/src/firepaint.cpp

plugins/freewins/src/freewins.cpp

plugins/gears/src/gears.cpp

plugins/gnomecompat/src/gnomecompat.cpp

plugins/grid/grid.xml.in

plugins/grid/src/grid.cpp

plugins/grid/src/grid.h

plugins/group/src/init.cpp

plugins/imgjpeg/src/imgjpeg.cpp

plugins/imgpng/src/imgpng.cpp

plugins/imgsvg/src/imgsvg.cpp

plugins/inotify/src/inotify.cpp

plugins/kde/src/kde.cpp

plugins/kdecompat/src/kdecompat.cpp

plugins/loginout/src/loginout.cpp

plugins/mag/src/mag.cpp

plugins/maximumize/src/maximumize.cpp

plugins/mblur/src/mblur.cpp

plugins/mousepoll/src/mousepoll.cpp

plugins/move/src/move.cpp

plugins/neg/src/neg.cpp

plugins/notification/src/notification.cpp

plugins/obs/obs.xml.in

plugins/obs/src/obs.cpp

plugins/obs/src/obs.h

plugins/opacify/src/opacify.cpp

plugins/opengl/src/fsregion/fsregion.cpp

plugins/opengl/src/fsregion/fsregion.h

plugins/opengl/src/fsregion/tests/test-fsregion.cpp

plugins/opengl/src/opengl.cpp

plugins/opengl/src/paint.cpp

plugins/place/src/place.cpp

plugins/put/put.xml.in

plugins/put/src/put.cpp

plugins/put/src/put.h

plugins/reflex/src/reflex.cpp

plugins/regex/src/regex.cpp

plugins/resize/src/logic/src/resize-logic.cpp

plugins/resize/src/resize.cpp

plugins/resizeinfo/src/resizeinfo.cpp

plugins/ring/src/ring.cpp

plugins/rotate/src/rotate.cpp

plugins/scale/src/scale.cpp

plugins/scaleaddon/src/scaleaddon.cpp

plugins/scalefilter/src/scalefilter.cpp

plugins/screenshot/src/screenshot.cpp

plugins/session/src/session.cpp

plugins/shelf/src/shelf.cpp

plugins/shift/shift.xml.in

plugins/shift/src/shift.cpp

plugins/showdesktop/src/showdesktop.cpp

plugins/showmouse/src/showmouse.cpp

plugins/showrepaint/src/showrepaint.cpp

plugins/snap/src/snap.cpp

plugins/splash/src/splash.cpp

plugins/stackswitch/src/stackswitch.cpp

plugins/staticswitcher/src/staticswitcher.cpp

plugins/staticswitcher/src/staticswitcher.h

plugins/switcher/src/switcher.cpp

plugins/td/src/3d.cpp

plugins/text/src/text.cpp

plugins/thumbnail/src/thumbnail.cpp

plugins/titleinfo/src/titleinfo.cpp

plugins/trailfocus/src/trailfocus.cpp

plugins/trip/src/trip.cpp

plugins/vpswitch/src/vpswitch.cpp

plugins/wall/src/wall.cpp

plugins/wallpaper/src/wallpaper.cpp

plugins/water/src/water.cpp

plugins/winrules/src/winrules.cpp

plugins/wizard/src/wizard.cpp

plugins/wobbly/src/wobbly.cpp

plugins/workarounds/src/workarounds.cpp

plugins/workspacenames/src/workspacenames.cpp

tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt

tests/system/xorg-gtest/tests/CMakeLists.txt

tests/xorg-gtest/CMakeLists.txt

tests/xorg-gtest/plugins/testhelper/src/testhelper.cpp

tests/xorg-gtest/src/compiz_xorg_gtest_main.cpp

Older »